diff options
author | rautenberg <rautenberg@in-silico.ch> | 2013-07-05 13:37:21 +0200 |
---|---|---|
committer | rautenberg <rautenberg@in-silico.ch> | 2013-07-05 13:37:21 +0200 |
commit | 14481fb722db64d835a6e9937d0dce14d81bfd79 (patch) | |
tree | eeb158c3a794fc495ebf5547e01a19e6ff7ca4e2 | |
parent | ed42105b2373d924ac63eacc45df291c9697772f (diff) |
do not use exit inside of classes! Skip it better.
-rw-r--r-- | test/authorization.rb | 11 | ||||
-rw-r--r-- | test/policy.rb | 4 |
2 files changed, 11 insertions, 4 deletions
diff --git a/test/authorization.rb b/test/authorization.rb index 07293d0..e14189a 100644 --- a/test/authorization.rb +++ b/test/authorization.rb @@ -4,8 +4,11 @@ TEST_URI = "http://only_a_test/test/" + rand(1000000).to_s class TestOpenToxAuthorizationBasic < MiniTest::Test i_suck_and_my_tests_are_order_dependent! - exit unless $aa[:uri] # no authorization tests without opensso server. - + + def setup + skip unless $aa[:uri] # no authorization tests without opensso server. + end + def test_01_server @aaserver = $aa[:uri] assert_equal(@aaserver, OpenTox::Authorization.server) @@ -58,6 +61,10 @@ end class TestOpenToxAuthorizationLDAP < MiniTest::Test + def setup + skip unless $aa[:uri] # no authorization tests without opensso server. + end + def test_01_create_check_delete_default_policies res = OpenTox::Authorization.send_policy(TEST_URI, SUBJECTID) assert res diff --git a/test/policy.rb b/test/policy.rb index a659b0d..3536f4d 100644 --- a/test/policy.rb +++ b/test/policy.rb @@ -62,7 +62,7 @@ class PolicyTest < MiniTest::Test end def test_04_group_user - return unless $aa[:uri] + skip unless $aa[:uri] policies = OpenTox::Policies.new() policies.load_default_policy($aa[:user], TEST_URI, "member") assert_equal "member", policies.policies["policy_group"].group @@ -70,7 +70,7 @@ class PolicyTest < MiniTest::Test end def test_05_DN - return unless $aa[:uri] + skip unless $aa[:uri] policies = OpenTox::Policies.new() policies.new_policy(POLICY_NAME) policy = policies.policies[policies.names[0]] |