[cedar-backup-svn] SF.net SVN: cedar-backup:[960] cedar-backup2/trunk/test/customizetests.py

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

Revision: 960
          http://cedar-backup.svn.sourceforge.net/cedar-backup/?rev=960&view=rev
Author:   pronovic
Date:     2010-01-10 23:23:14 +0000 (Sun, 10 Jan 2010)

Log Message:
-----------
Tweak tests so they work properly with Debian customizations

Modified Paths:
--------------
    cedar-backup2/trunk/test/customizetests.py

Modified: cedar-backup2/trunk/test/customizetests.py
===================================================================
--- cedar-backup2/trunk/test/customizetests.py	2010-01-10 22:59:22 UTC (rev 959)
+++ cedar-backup2/trunk/test/customizetests.py	2010-01-10 23:23:14 UTC (rev 960)
@@ -49,7 +49,7 @@
 
 import unittest
 
-from CedarBackup2.customize import customizeOverrides
+from CedarBackup2.customize import PLATFORM, customizeOverrides
 from CedarBackup2.config import Config, OptionsConfig, CommandOverride
 
 
@@ -78,10 +78,11 @@
       config = Config()
       options = OptionsConfig();
       options.overrides = []
+      if PLATFORM == "standard":
+         config.options = options
+         customizeOverrides(config)
+         self.failUnlessEqual([], options.overrides); 
       config.options = options
-      customizeOverrides(config)    # relies on default, which should be "standard"
-      self.failUnlessEqual([], options.overrides); 
-      config.options = options
       customizeOverrides(config, platform="standard")
       self.failUnlessEqual([], options.overrides); 
 
@@ -92,10 +93,11 @@
       config = Config()
       options = OptionsConfig();
       options.overrides = [ CommandOverride("cdrecord", "/blech"), ]
+      if PLATFORM == "standard":
+         config.options = options
+         customizeOverrides(config)
+         self.failUnlessEqual([ CommandOverride("cdrecord", "/blech"), ], options.overrides); 
       config.options = options
-      customizeOverrides(config)    # relies on default, which should be "standard"
-      self.failUnlessEqual([ CommandOverride("cdrecord", "/blech"), ], options.overrides); 
-      config.options = options
       customizeOverrides(config, platform="standard")
       self.failUnlessEqual([ CommandOverride("cdrecord", "/blech"), ], options.overrides); 
 
@@ -106,10 +108,11 @@
       config = Config()
       options = OptionsConfig();
       options.overrides = [ CommandOverride("mkisofs", "/blech"), ]
+      if PLATFORM == "standard":
+         config.options = options
+         customizeOverrides(config)
+         self.failUnlessEqual([ CommandOverride("mkisofs", "/blech"), ], options.overrides); 
       config.options = options
-      customizeOverrides(config)    # relies on default, which should be "standard"
-      self.failUnlessEqual([ CommandOverride("mkisofs", "/blech"), ], options.overrides); 
-      config.options = options
       customizeOverrides(config, platform="standard")
       self.failUnlessEqual([ CommandOverride("mkisofs", "/blech"), ], options.overrides); 
 
@@ -120,10 +123,11 @@
       config = Config()
       options = OptionsConfig();
       options.overrides = [ CommandOverride("cdrecord", "/blech"), CommandOverride("mkisofs", "/blech2"), ]
+      if PLATFORM == "standard":
+         config.options = options
+         customizeOverrides(config)
+         self.failUnlessEqual([ CommandOverride("cdrecord", "/blech"), CommandOverride("mkisofs", "/blech2"), ], options.overrides); 
       config.options = options
-      customizeOverrides(config)    # relies on default, which should be "standard"
-      self.failUnlessEqual([ CommandOverride("cdrecord", "/blech"), CommandOverride("mkisofs", "/blech2"), ], options.overrides); 
-      config.options = options
       customizeOverrides(config, platform="standard")
       self.failUnlessEqual([ CommandOverride("cdrecord", "/blech"), CommandOverride("mkisofs", "/blech2"), ], options.overrides); 
 
@@ -134,6 +138,10 @@
       config = Config()
       options = OptionsConfig();
       options.overrides = []
+      if PLATFORM == "debian":
+         config.options = options
+         customizeOverrides(config)
+         self.failUnlessEqual([ CommandOverride("cdrecord", "/usr/bin/wodim"), CommandOverride("mkisofs", "/usr/bin/genisoimage"), ], options.overrides); 
       config.options = options
       customizeOverrides(config, platform="debian")
       self.failUnlessEqual([ CommandOverride("cdrecord", "/usr/bin/wodim"), CommandOverride("mkisofs", "/usr/bin/genisoimage"), ], options.overrides); 
@@ -145,6 +153,10 @@
       config = Config()
       options = OptionsConfig();
       options.overrides = [ CommandOverride("cdrecord", "/blech"), ]
+      if PLATFORM == "debian":
+         config.options = options
+         customizeOverrides(config)
+         self.failUnlessEqual([ CommandOverride("cdrecord", "/blech"), CommandOverride("mkisofs", "/usr/bin/genisoimage"), ], options.overrides); 
       config.options = options
       customizeOverrides(config, platform="debian")
       self.failUnlessEqual([ CommandOverride("cdrecord", "/blech"), CommandOverride("mkisofs", "/usr/bin/genisoimage"), ], options.overrides); 
@@ -156,6 +168,10 @@
       config = Config()
       options = OptionsConfig();
       options.overrides = [ CommandOverride("mkisofs", "/blech"), ]
+      if PLATFORM == "debian":
+         config.options = options
+         customizeOverrides(config)
+         self.failUnlessEqual([ CommandOverride("cdrecord", "/usr/bin/wodim"), CommandOverride("mkisofs", "/blech"), ], options.overrides); 
       config.options = options
       customizeOverrides(config, platform="debian")
       self.failUnlessEqual([ CommandOverride("cdrecord", "/usr/bin/wodim"), CommandOverride("mkisofs", "/blech"), ], options.overrides); 
@@ -167,6 +183,10 @@
       config = Config()
       options = OptionsConfig();
       options.overrides = [ CommandOverride("cdrecord", "/blech"), CommandOverride("mkisofs", "/blech2"), ]
+      if PLATFORM == "debian":
+         config.options = options
+         customizeOverrides(config)
+         self.failUnlessEqual([ CommandOverride("cdrecord", "/blech"), CommandOverride("mkisofs", "/blech2"), ], options.overrides); 
       config.options = options
       customizeOverrides(config, platform="debian")
       self.failUnlessEqual([ CommandOverride("cdrecord", "/blech"), CommandOverride("mkisofs", "/blech2"), ], options.overrides); 


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