diff options
| author | Greg Hudson <ghudson@mit.edu> | 2012-12-16 16:55:29 -0500 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2012-12-20 11:45:20 -0500 |
| commit | 966547dfeb011800d4b78b8e5d494813bc80559c (patch) | |
| tree | 4226bd168056336c965a4aa77c845093ef723da3 /src/appl | |
| parent | 76c27cf7e3161e0f20f8935d82ae0f2feb77b01a (diff) | |
| download | krb5-966547dfeb011800d4b78b8e5d494813bc80559c.zip krb5-966547dfeb011800d4b78b8e5d494813bc80559c.tar.gz krb5-966547dfeb011800d4b78b8e5d494813bc80559c.tar.bz2 | |
Simplify k5test.py environments
The initial k5test.py design, copied from the dejagnu suite, is to
create config files and environments for four expected roles: client,
server, master, and slave. This approach exaggerates the complexity
of the common case, where the configurations don't need to vary, and
limits us to having just one slave for kprop/iprop tests.
Instead, create just one configuration by default, and add a
special_env() method which sets up a differently configured
environment for the few test cases which need one. The run_as_*()
methods are collapsed into just run(), which accepts an optional
argument for the environment returned by special_env().
Diffstat (limited to 'src/appl')
| -rw-r--r-- | src/appl/gss-sample/t_gss_sample.py | 4 | ||||
| -rw-r--r-- | src/appl/user_user/t_user2user.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/appl/gss-sample/t_gss_sample.py b/src/appl/gss-sample/t_gss_sample.py index 211da97..faec8a0 100644 --- a/src/appl/gss-sample/t_gss_sample.py +++ b/src/appl/gss-sample/t_gss_sample.py @@ -35,8 +35,8 @@ def server_client_test(realm, options): portstr = str(realm.server_port()) server = realm.start_server([gss_server, '-port', portstr, 'host'], 'starting...') - output = realm.run_as_client([gss_client, '-port', portstr] + options + - [hostname, 'host', 'testmsg']) + output = realm.run([gss_client, '-port', portstr] + options + + [hostname, 'host', 'testmsg']) if 'Signature verified.' not in output: fail('Expected message not seen in gss-client output') stop_daemon(server) diff --git a/src/appl/user_user/t_user2user.py b/src/appl/user_user/t_user2user.py index abd6641..8bdef8e 100644 --- a/src/appl/user_user/t_user2user.py +++ b/src/appl/user_user/t_user2user.py @@ -10,7 +10,7 @@ for realm in multipass_realms(): else: srv_output = realm.start_server(['./uuserver', '9999'], 'Server started') - output = realm.run_as_client(['./uuclient', hostname, 'testing message', '9999']) + output = realm.run(['./uuclient', hostname, 'testing message', '9999']) if 'uu-client: server says \"Hello, other end of connection.\"' not in output: fail('Message not echoed back.') |