[cedar-backup-svn] SF.net SVN: cedar-backup:[982] cedar-backup2/trunk

[<pro...@us...>]

Revision: 982
          http://cedar-backup.svn.sourceforge.net/cedar-backup/?rev=982&view=rev
Author:   pronovic
Date:     2010-06-30 23:03:17 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
Move unit tests into testcase folder to avoid test.py naming conflict

Modified Paths:
--------------
    cedar-backup2/trunk/Changelog
    cedar-backup2/trunk/testcase/actionsutiltests.py
    cedar-backup2/trunk/testcase/capacitytests.py
    cedar-backup2/trunk/testcase/cdwritertests.py
    cedar-backup2/trunk/testcase/configtests.py
    cedar-backup2/trunk/testcase/dvdwritertests.py
    cedar-backup2/trunk/testcase/encrypttests.py
    cedar-backup2/trunk/testcase/filesystemtests.py
    cedar-backup2/trunk/testcase/mboxtests.py
    cedar-backup2/trunk/testcase/mysqltests.py
    cedar-backup2/trunk/testcase/peertests.py
    cedar-backup2/trunk/testcase/postgresqltests.py
    cedar-backup2/trunk/testcase/splittests.py
    cedar-backup2/trunk/testcase/subversiontests.py
    cedar-backup2/trunk/testcase/utiltests.py
    cedar-backup2/trunk/testcase/writersutiltests.py
    cedar-backup2/trunk/util/test.py

Added Paths:
-----------
    cedar-backup2/trunk/testcase/

Removed Paths:
-------------
    cedar-backup2/trunk/test/

Modified: cedar-backup2/trunk/Changelog
===================================================================
--- cedar-backup2/trunk/Changelog	2010-06-30 22:56:19 UTC (rev 981)
+++ cedar-backup2/trunk/Changelog	2010-06-30 23:03:17 UTC (rev 982)
@@ -1,7 +1,8 @@
 Version 2.19.7    unreleased
 
 	* Configure pylint and execute it against the entire codebase.
-	* Fix a variety of minor warnings and suggestions from pylint.
+	  - Fix a variety of minor warnings and suggestions from pylint
+	  - Move unit tests into testcase folder to avoid test.py naming conflict
 
 Version 2.19.6    22 May 2010
 


Property changes on: cedar-backup2/trunk/testcase
___________________________________________________________________
Added: svn:mergeinfo
   + 

Modified: cedar-backup2/trunk/testcase/actionsutiltests.py
===================================================================
--- cedar-backup2/trunk/test/actionsutiltests.py	2010-06-30 01:19:43 UTC (rev 978)
+++ cedar-backup2/trunk/testcase/actionsutiltests.py	2010-06-30 23:03:17 UTC (rev 982)
@@ -88,7 +88,7 @@
 # Module-wide configuration and constants
 #######################################################################
 
-DATA_DIRS = [ "./data", "./test/data", ]
+DATA_DIRS = [ "./data", "./testcase/data", ]
 RESOURCES = [ "tree1.tar.gz", "tree8.tar.gz", "tree15.tar.gz", "tree17.tar.gz",
               "tree18.tar.gz", "tree19.tar.gz", "tree20.tar.gz", ]
 

Modified: cedar-backup2/trunk/testcase/capacitytests.py
===================================================================
--- cedar-backup2/trunk/test/capacitytests.py	2010-06-30 01:19:43 UTC (rev 978)
+++ cedar-backup2/trunk/testcase/capacitytests.py	2010-06-30 23:03:17 UTC (rev 982)
@@ -106,7 +106,7 @@
 # Module-wide configuration and constants
 #######################################################################
 
-DATA_DIRS = [ "./data", "./test/data", ]
+DATA_DIRS = [ "./data", "./testcase/data", ]
 RESOURCES = [ "capacity.conf.1", "capacity.conf.2", "capacity.conf.3", "capacity.conf.4", ]
 
 

Modified: cedar-backup2/trunk/testcase/cdwritertests.py
===================================================================
--- cedar-backup2/trunk/test/cdwritertests.py	2010-06-30 01:19:43 UTC (rev 978)
+++ cedar-backup2/trunk/testcase/cdwritertests.py	2010-06-30 23:03:17 UTC (rev 982)
@@ -125,7 +125,7 @@
 ILEAD = (11400.0*2048.0)         # Initial lead-in
 SLEAD = (6900.0*2048.0)          # Session lead-in
 
-DATA_DIRS = [ "./data", "./test/data", ]
+DATA_DIRS = [ "./data", "./testcase/data", ]
 RESOURCES = [ "tree9.tar.gz", ]
 
 SUDO_CMD = [ "sudo", ]

Modified: cedar-backup2/trunk/testcase/configtests.py
===================================================================
--- cedar-backup2/trunk/test/configtests.py	2010-06-30 01:19:43 UTC (rev 978)
+++ cedar-backup2/trunk/testcase/configtests.py	2010-06-30 23:03:17 UTC (rev 982)
@@ -116,7 +116,7 @@
 # Module-wide configuration and constants
 #######################################################################
 
-DATA_DIRS = [ "./data", "./test/data", ]
+DATA_DIRS = [ "./data", "./testcase/data", ]
 RESOURCES = [ "cback.conf.1", "cback.conf.2", "cback.conf.3", "cback.conf.4", 
               "cback.conf.5", "cback.conf.6", "cback.conf.7", "cback.conf.8", 
               "cback.conf.9", "cback.conf.10", "cback.conf.11", "cback.conf.12", 

Modified: cedar-backup2/trunk/testcase/dvdwritertests.py
===================================================================
--- cedar-backup2/trunk/test/dvdwritertests.py	2010-06-30 01:19:43 UTC (rev 978)
+++ cedar-backup2/trunk/testcase/dvdwritertests.py	2010-06-30 23:03:17 UTC (rev 982)
@@ -107,7 +107,7 @@
 GB44        = (4.4*1024.0*1024.0*1024.0)  # 4.4 GB 
 GB44SECTORS = GB44/2048.0                 # 4.4 GB in 2048-byte sectors
 
-DATA_DIRS = [ "./data", "./test/data", ]
+DATA_DIRS = [ "./data", "./testcase/data", ]
 RESOURCES = [ "tree9.tar.gz", ]
 
 

Modified: cedar-backup2/trunk/testcase/encrypttests.py
===================================================================
--- cedar-backup2/trunk/test/encrypttests.py	2010-06-30 01:19:43 UTC (rev 978)
+++ cedar-backup2/trunk/testcase/encrypttests.py	2010-06-30 23:03:17 UTC (rev 982)
@@ -117,7 +117,7 @@
 # Module-wide configuration and constants
 #######################################################################
 
-DATA_DIRS = [ "./data", "./test/data", ]
+DATA_DIRS = [ "./data", "./testcase/data", ]
 RESOURCES = [ "encrypt.conf.1", "encrypt.conf.2", "tree1.tar.gz", "tree2.tar.gz", 
               "tree8.tar.gz", "tree15.tar.gz", "tree16.tar.gz", "tree17.tar.gz",
               "tree18.tar.gz", "tree19.tar.gz", "tree20.tar.gz", ]

Modified: cedar-backup2/trunk/testcase/filesystemtests.py
===================================================================
--- cedar-backup2/trunk/test/filesystemtests.py	2010-06-30 01:19:43 UTC (rev 978)
+++ cedar-backup2/trunk/testcase/filesystemtests.py	2010-06-30 23:03:17 UTC (rev 982)
@@ -128,7 +128,7 @@
 # Module-wide configuration and constants
 #######################################################################
 
-DATA_DIRS = [ "./data", "./test/data" ]
+DATA_DIRS = [ "./data", "./testcase/data" ]
 RESOURCES = [ "tree1.tar.gz", "tree2.tar.gz", "tree3.tar.gz", "tree4.tar.gz", "tree5.tar.gz",
               "tree6.tar.gz", "tree7.tar.gz", "tree8.tar.gz", "tree9.tar.gz", "tree10.tar.gz", 
               "tree11.tar.gz", "tree12.tar.gz", "tree13.tar.gz", "tree22.tar.gz", ]

Modified: cedar-backup2/trunk/testcase/mboxtests.py
===================================================================
--- cedar-backup2/trunk/test/mboxtests.py	2010-06-30 01:19:43 UTC (rev 978)
+++ cedar-backup2/trunk/testcase/mboxtests.py	2010-06-30 23:03:17 UTC (rev 982)
@@ -109,7 +109,7 @@
 # Module-wide configuration and constants
 #######################################################################
 
-DATA_DIRS = [ "./data", "./test/data", ]
+DATA_DIRS = [ "./data", "./testcase/data", ]
 RESOURCES = [ "mbox.conf.1", "mbox.conf.2", "mbox.conf.3", "mbox.conf.4", ]
 
 

Modified: cedar-backup2/trunk/testcase/mysqltests.py
===================================================================
--- cedar-backup2/trunk/test/mysqltests.py	2010-06-30 01:19:43 UTC (rev 978)
+++ cedar-backup2/trunk/testcase/mysqltests.py	2010-06-30 23:03:17 UTC (rev 982)
@@ -119,7 +119,7 @@
 # Module-wide configuration and constants
 #######################################################################
 
-DATA_DIRS = [ "./data", "./test/data", ]
+DATA_DIRS = [ "./data", "./testcase/data", ]
 RESOURCES = [ "mysql.conf.1", "mysql.conf.2", "mysql.conf.3", "mysql.conf.4", "mysql.conf.5", ]
 
 

Modified: cedar-backup2/trunk/testcase/peertests.py
===================================================================
--- cedar-backup2/trunk/test/peertests.py	2010-06-30 01:19:43 UTC (rev 978)
+++ cedar-backup2/trunk/testcase/peertests.py	2010-06-30 23:03:17 UTC (rev 982)
@@ -110,7 +110,7 @@
 # Module-wide configuration and constants
 #######################################################################
 
-DATA_DIRS = [ "./data", "./test/data", ]
+DATA_DIRS = [ "./data", "./testcase/data", ]
 RESOURCES = [ "tree1.tar.gz", "tree2.tar.gz", "tree9.tar.gz", ]
 
 REMOTE_HOST      = "localhost"                        # Always use login@localhost as our "remote" host

Modified: cedar-backup2/trunk/testcase/postgresqltests.py
===================================================================
--- cedar-backup2/trunk/test/postgresqltests.py	2010-06-30 01:19:43 UTC (rev 978)
+++ cedar-backup2/trunk/testcase/postgresqltests.py	2010-06-30 23:03:17 UTC (rev 982)
@@ -119,7 +119,7 @@
 # Module-wide configuration and constants
 #######################################################################
 
-DATA_DIRS = [ "./data", "./test/data", ]
+DATA_DIRS = [ "./data", "./testcase/data", ]
 RESOURCES = [ "postgresql.conf.1", "postgresql.conf.2", "postgresql.conf.3", "postgresql.conf.4", "postgresql.conf.5", ]
 
 

Modified: cedar-backup2/trunk/testcase/splittests.py
===================================================================
--- cedar-backup2/trunk/test/splittests.py	2010-06-30 01:19:43 UTC (rev 978)
+++ cedar-backup2/trunk/testcase/splittests.py	2010-06-30 23:03:17 UTC (rev 982)
@@ -121,7 +121,7 @@
 # Module-wide configuration and constants
 #######################################################################
 
-DATA_DIRS = [ "./data", "./test/data", ]
+DATA_DIRS = [ "./data", "./testcase/data", ]
 RESOURCES = [ "split.conf.1", "split.conf.2", "split.conf.3", "split.conf.4", "split.conf.5", "tree21.tar.gz", ]
 
 INVALID_PATH = "bogus"  # This path name should never exist

Modified: cedar-backup2/trunk/testcase/subversiontests.py
===================================================================
--- cedar-backup2/trunk/test/subversiontests.py	2010-06-30 01:19:43 UTC (rev 978)
+++ cedar-backup2/trunk/testcase/subversiontests.py	2010-06-30 23:03:17 UTC (rev 982)
@@ -121,7 +121,7 @@
 # Module-wide configuration and constants
 #######################################################################
 
-DATA_DIRS = [ "./data", "./test/data", ]
+DATA_DIRS = [ "./data", "./testcase/data", ]
 RESOURCES = [ "subversion.conf.1", "subversion.conf.2", "subversion.conf.3", "subversion.conf.4", 
               "subversion.conf.5", "subversion.conf.6", "subversion.conf.7", ]
 

Modified: cedar-backup2/trunk/testcase/utiltests.py
===================================================================
--- cedar-backup2/trunk/test/utiltests.py	2010-06-30 01:19:43 UTC (rev 978)
+++ cedar-backup2/trunk/testcase/utiltests.py	2010-06-30 23:03:17 UTC (rev 982)
@@ -97,7 +97,7 @@
 # Module-wide configuration and constants
 #######################################################################
 
-DATA_DIRS = [ "./data", "./test/data" ]
+DATA_DIRS = [ "./data", "./testcase/data" ]
 RESOURCES = [ "lotsoflines.py", "tree10.tar.gz", ]
 
 

Modified: cedar-backup2/trunk/testcase/writersutiltests.py
===================================================================
--- cedar-backup2/trunk/test/writersutiltests.py	2010-06-30 01:19:43 UTC (rev 978)
+++ cedar-backup2/trunk/testcase/writersutiltests.py	2010-06-30 23:03:17 UTC (rev 982)
@@ -108,7 +108,7 @@
 # Module-wide configuration and constants
 #######################################################################
 
-DATA_DIRS = [ "./data", "./test/data", ]
+DATA_DIRS = [ "./data", "./testcase/data", ]
 RESOURCES = [ "tree9.tar.gz", ]
 
 SUDO_CMD = [ "sudo", ]

Modified: cedar-backup2/trunk/util/test.py
===================================================================
--- cedar-backup2/trunk/util/test.py	2010-06-30 22:56:19 UTC (rev 981)
+++ cedar-backup2/trunk/util/test.py	2010-06-30 23:03:17 UTC (rev 982)
@@ -140,34 +140,34 @@
 
    # Import the unit test modules
    try:
-      if os.path.exists(os.path.join(".", "test", "filesystemtests.py")):
+      if os.path.exists(os.path.join(".", "testcase", "filesystemtests.py")):
          sys.path.insert(0, ".")
-      elif os.path.basename(os.getcwd()) == "test" and os.path.exists(os.path.join("..", "test", "filesystemtests.py")):
+      elif os.path.basename(os.getcwd()) == "testcase" and os.path.exists(os.path.join("..", "testcase", "filesystemtests.py")):
          sys.path.insert(0, "..")
       else:
          print "WARNING: CedarBackup2 unit test modules were not found in"
          print "the expected location.  If the import succeeds, you may be"
          print "using an unexpected version of the test suite."
          print ""
-      import test.utiltests as utiltests
-      import test.knapsacktests as knapsacktests
-      import test.filesystemtests as filesystemtests
-      import test.peertests as peertests
-      import test.actionsutiltests as actionsutiltests
-      import test.writersutiltests as writersutiltests
-      import test.cdwritertests as cdwritertests
-      import test.dvdwritertests as dvdwritertests
-      import test.configtests as configtests
-      import test.clitests as clitests
-      import test.mysqltests as mysqltests
-      import test.postgresqltests as postgresqltests
-      import test.subversiontests as subversiontests
-      import test.mboxtests as mboxtests
-      import test.encrypttests as encrypttests
-      import test.splittests as splittests
-      import test.spantests as spantests
-      import test.capacitytests as capacitytests
-      import test.customizetests as customizetests
+      from testcase import utiltests
+      from testcase import knapsacktests
+      from testcase import filesystemtests
+      from testcase import peertests
+      from testcase import actionsutiltests
+      from testcase import writersutiltests
+      from testcase import cdwritertests
+      from testcase import dvdwritertests
+      from testcase import configtests
+      from testcase import clitests
+      from testcase import mysqltests
+      from testcase import postgresqltests
+      from testcase import subversiontests
+      from testcase import mboxtests
+      from testcase import encrypttests
+      from testcase import splittests
+      from testcase import spantests
+      from testcase import capacitytests
+      from testcase import customizetests
    except ImportError, e:
       print "Failed to import CedarBackup2 unit test module: %s" % e
       print "You must either run the unit tests from the CedarBackup2 source"
@@ -235,9 +235,9 @@
    # Create and run the test suite
    print ""
    suite = unittest.TestSuite(unittests.values())
-   result = unittest.TextTestRunner(verbosity=1).run(suite)
+   suiteResult = unittest.TextTestRunner(verbosity=1).run(suite)
    print ""
-   if not result.wasSuccessful():
+   if not suiteResult.wasSuccessful():
       return 1
    else:
       return 0


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.