From f0759d14ca2c258b42e1401c9a686da14ed4f06c Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 24 Apr 2013 18:40:54 +0200 Subject: =?UTF-8?q?Adapt=20to=20changes=20in=20lightdm-remote-login-x2go?= =?UTF-8?q?=20(0.0.1.0).=20Expect=20a=20UCCS=20service=20that=20supports?= =?UTF-8?q?=20session=20type=20=C2=BBx2go=C2=BB.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/Makefile.am | 8 ++++---- tests/mock_guest.c | 2 +- tests/mock_guest.h | 2 +- tests/mock_pam.c | 6 +++--- tests/mock_pam.h | 2 +- tests/test-x2go-auth.c | 6 +++--- tests/test-x2go-wrapper.cc | 12 ++++++------ 7 files changed, 19 insertions(+), 19 deletions(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index 97f137d..ce629ea 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -41,21 +41,21 @@ libgtest_a_CXXFLAGS = \ test_x2go_wrapper: test-x2go-auth -test_pyhoca_wrapper_SOURCES = \ +test_x2go_wrapper_SOURCES = \ mock_pam.c mock_pam.h \ mock_guest.c mock_guest.h \ test-x2go-wrapper.cc -test_pyhoca_wrapper_LDADD = \ +test_x2go_wrapper_LDADD = \ $(top_builddir)/src/libssh.la \ libgtest.a -test_pyhoca_wrapper_CXXFLAGS = \ +test_x2go_wrapper_CXXFLAGS = \ $(AM_CXXFLAGS) \ -DAUTH_CHECK="\"$(abs_builddir)/test-x2go-auth\"" \ -I${top_srcdir}/src -test_pyhoca_wrapper_LDFLAGS = \ +test_x2go_wrapper_LDFLAGS = \ -pthread ########################## diff --git a/tests/mock_guest.c b/tests/mock_guest.c index fab61e2..ea4861b 100644 --- a/tests/mock_guest.c +++ b/tests/mock_guest.c @@ -1,5 +1,5 @@ /* - * Copyright © 2012 Mike Gabriel . + * Copyright © 2012-2013 Mike Gabriel . * Copyright © 2012 Canonical Ltd. All rights reserved. * * Author(s): Mike Gabriel diff --git a/tests/mock_guest.h b/tests/mock_guest.h index 8257d30..b7c78e8 100644 --- a/tests/mock_guest.h +++ b/tests/mock_guest.h @@ -1,5 +1,5 @@ /* - * Copyright © 2012 Mike Gabriel . + * Copyright © 2012-2013 Mike Gabriel . * Copyright © 2012 Canonical Ltd. All rights reserved. * * Author(s): Mike Gabriel diff --git a/tests/mock_pam.c b/tests/mock_pam.c index 2da9963..64c503f 100644 --- a/tests/mock_pam.c +++ b/tests/mock_pam.c @@ -1,5 +1,5 @@ /* - * Copyright © 2012 Mike Gabriel . + * Copyright © 2012-2013 Mike Gabriel . * Copyright © 2012 Canonical Ltd. All rights reserved. * * Author(s): Mike Gabriel @@ -39,8 +39,8 @@ int fake_conv (int num_msg, const struct pam_message **msg, response->resp = strdup ("protocol://rhost/dummy"); else if (strcmp((*msg)->msg, "password:") == 0) response->resp = strdup ("password"); - else if (strcmp((*msg)->msg, "domain:") == 0) - response->resp = strdup ("domain"); + else if (strcmp((*msg)->msg, "sessiontype:") == 0) + response->resp = strdup ("sessiontype"); else return PAM_SYMBOL_ERR; /* leaks... */ diff --git a/tests/mock_pam.h b/tests/mock_pam.h index 9bdd74d..c335e49 100644 --- a/tests/mock_pam.h +++ b/tests/mock_pam.h @@ -1,5 +1,5 @@ /* - * Copyright © 2012 Mike Gabriel . + * Copyright © 2012-2013 Mike Gabriel . * Copyright © 2012 Canonical Ltd. All rights reserved. * * Author(s): Mike Gabriel diff --git a/tests/test-x2go-auth.c b/tests/test-x2go-auth.c index 1753f9b..592f0c7 100644 --- a/tests/test-x2go-auth.c +++ b/tests/test-x2go-auth.c @@ -1,5 +1,5 @@ /* - * Copyright © 2012 Mike Gabriel + * Copyright © 2012-2013 Mike Gabriel * Copyright © 2012 Canonical Ltd. * * This program is free software: you can redistribute it and/or modify it @@ -45,8 +45,8 @@ main (int argc, char * argv[]) return -1; } - /* Check domain */ - if (strcmp(argv[3], "domain")) { + /* Check session type */ + if (strcmp(argv[3], "sessiontype")) { return -1; } diff --git a/tests/test-x2go-wrapper.cc b/tests/test-x2go-wrapper.cc index 24e49c0..a792d3e 100644 --- a/tests/test-x2go-wrapper.cc +++ b/tests/test-x2go-wrapper.cc @@ -1,5 +1,5 @@ /* - * Copyright © 2012 Mike Gabriel . + * Copyright © 2012-2013 Mike Gabriel . * Copyright © 2012 Canonical Ltd. All rights reserved. * * Author(s): Mike Gabriel @@ -23,17 +23,17 @@ const char * auth_check_path = AUTH_CHECK; namespace { // The fixture for testing class Foo. - class PyhocaWrapperTest : public ::testing::Test { + class X2GoWrapperTest : public ::testing::Test { protected: // You can remove any or all of the following functions if its body // is empty. - PyhocaWrapperTest() { + X2GoWrapperTest() { // You can do set-up work for each test here. setenv("HOME", "/tmp", 1 /* overwrite */); } - virtual ~PyhocaWrapperTest() { + virtual ~X2GoWrapperTest() { // You can do clean-up work that doesn't throw exceptions here. } @@ -55,12 +55,12 @@ namespace { // Objects declared here can be used by all tests in the test case for Foo. }; - TEST_F(PyhocaWrapperTest, canLinkTheWholeGang) { + TEST_F(X2GoWrapperTest, canLinkTheWholeGang) { EXPECT_EQ (1, 1); // right, that's trivial, but that means // that I got all of the wrapper and pam to link there } - TEST_F(PyhocaWrapperTest, canCallPamOpenSession) { + TEST_F(X2GoWrapperTest, canCallPamOpenSession) { const char *argv[] = { NULL }; pam_handle_t *pamh = pam_handle_new (); -- cgit v1.2.3