Merge lp:~greglange/swift/lp702106 into lp:~hudson-openstack/swift/trunk

[Greg Lange]

Made older functional tests look for default config file when env variable is unset

[gholt (gholt)]

review: Approve

=== modified file 'test/functional/swift.py'
--- test/functional/swift.py	2011-01-05 15:17:36 +0000
+++ test/functional/swift.py	2011-01-12 21:11:47 +0000
@@ -24,6 +24,7 @@
 
 import simplejson as json
 
+from nose import SkipTest
 from xml.dom import minidom
 
 class AuthenticationFailed(Exception):
@@ -79,6 +80,10 @@
 
 class Connection(object):
     def __init__(self, config):
+        for key in 'auth_host auth_port auth_ssl account username password'.split():
+            if not config.has_key(key):
+                raise SkipTest
+
         self.auth_host = config['auth_host']
         self.auth_port = int(config['auth_port'])
         self.auth_ssl = config['auth_ssl'] in ('on', 'true', 'yes', '1')

=== modified file 'test/functional/tests.py'
--- test/functional/tests.py	2011-01-04 23:34:43 +0000
+++ test/functional/tests.py	2011-01-12 21:11:47 +0000
@@ -19,8 +19,10 @@
 from datetime import datetime
 import locale
 import os
+import os.path
 import random
 import StringIO
+import sys
 import time
 import threading
 import uuid
@@ -30,11 +32,19 @@
 from swift import Account, AuthenticationFailed, Connection, Container, \
      File, ResponseError
 
-config = configobj.ConfigObj(os.environ['SWIFT_TEST_CONFIG_FILE'])
+config_file_env_var = 'SWIFT_TEST_CONFIG_FILE'
+default_config_file = '/etc/swift/func_test.conf'
+
+if os.environ.has_key(config_file_env_var):
+    config_file = os.environ[config_file_env_var]
+elif os.path.isfile(default_config_file):
+    config_file = default_config_file
+else:
+    print >>sys.stderr, 'SKIPPING FUNCTIONAL TESTS DUE TO NO CONFIG'
+
+config = configobj.ConfigObj(config_file)
 locale.setlocale(locale.LC_COLLATE, config.get('collate', 'C'))
 
-NoRun = object
-
 class Base:
     pass