Merge pull request #70 from ohumbel/credentials

enable RTC credentials on the command line

Author: ohumbel

configuration.py

@@ -8,6 +8,8 @@
 
 config = None
 configfile = None
+user = None
+password = None
 
 
 def read(configname=None):
@@ -19,8 +21,12 @@ def read(configname=None):
     generalsection = parsedconfig['General']
     migrationsection = parsedconfig['Migration']
     miscsectionname = 'Miscellaneous'
-    user = generalsection['User']
-    password = generalsection['Password']
+    global user
+    if not user:
+        user = generalsection['User']
+    global password
+    if not password:
+        password = generalsection['Password']
     repositoryurl = generalsection['Repo']
     scmcommand = generalsection.get('ScmCommand', "lscm")
     shell.logcommands = parsedconfig.get(miscsectionname, 'LogShellCommands', fallback="False") == "True"
@@ -68,6 +74,16 @@ def setconfigfile(newconfigfile):
     configfile = newconfigfile
 
 
+def setUser(newuser):
+    global user
+    user = newuser
+
+
+def setPassword(newpassword):
+    global password
+    password = newpassword
+
+
 def getinitialcomponentbaselines(definedbaselines):
     initialcomponentbaselines = []
     if definedbaselines:

migration.py

@@ -112,8 +112,12 @@ def parsecommandline():
     configfilehelp = 'name of the config file, or full path to the config file; defaults to ' + configfiledefault
     parser.add_argument('-c', '--configfile', metavar='file', dest='configfile', help=configfilehelp,
                         default=configfiledefault)
+    parser.add_argument('-u', '--user', metavar='user', dest='user', help='RTC user', default=None)
+    parser.add_argument('-p', '--password', metavar='password', dest='password', help='RTC password', default=None)
     arguments = parser.parse_args()
     configuration.setconfigfile(arguments.configfile)
+    configuration.setUser(arguments.user)
+    configuration.setPassword(arguments.password)
 
 
 def validate():

tests/test_configuration.py

@@ -14,6 +14,9 @@ def setUp(self):
         # reset global shell variables
         shell.logcommands = False
         shell.encoding = None
+        configuration.setconfigfile(None)
+        configuration.setUser(None)
+        configuration.setPassword(None)
 
     def test_DeletionOfFolder(self):
         config = Builder().setworkdirectory(self.workdirectory).build()
@@ -66,6 +69,12 @@ def test_fileExtensionsToBeIgnored_MultipleExtensions(self):
     def test_read_passedin_configfile(self):
         self._assertTestConfig(configuration.read(testhelper.getrelativefilename('resources/test_config.ini')))
 
+    def test_read_passedin_configfile_expect_override_user_password(self):
+        configuration.setUser('newUser')
+        configuration.setPassword('newPassword')
+        self._assertTestConfig(configuration.read(testhelper.getrelativefilename('resources/test_config.ini')),
+                               user='newUser', password='newPassword')
+
     def test_read_configfile_from_configuration(self):
         configuration.setconfigfile(testhelper.getrelativefilename('resources/test_config.ini'))
         self._assertTestConfig(configuration.read())
@@ -74,11 +83,17 @@ def test_read_minimumconfigfile_shouldrelyonfallbackvalues(self):
         configuration.setconfigfile(testhelper.getrelativefilename('resources/test_minimum_config.ini'))
         self._assertDefaultConfig(configuration.read())
 
-    def _assertTestConfig(self, config):
+    def _assertTestConfig(self, config, user=None, password=None):
         # [General]
         self.assertEqual('https://rtc.supercompany.com/ccm/', config.repo)
-        self.assertEqual('superuser', config.user)
-        self.assertEqual('supersecret', config.password)
+        if not user:
+            self.assertEqual('superuser', config.user)
+        else:
+            self.assertEqual(user, config.user)
+        if not password:
+            self.assertEqual('supersecret', config.password)
+        else:
+            self.assertEqual(password, config.password)
         self.assertEqual('super.git', config.gitRepoName)
         self.assertEqual('Superworkspace', config.workspace)
         self.assertEqual('/tmp/migration', config.workDirectory)

tests/test_gitFunctions.py

@@ -30,7 +30,7 @@ def test_ExistingFileStartsWithLowerCase_RenameToUpperCase_ExpectGitRename(self)
     def assertGitStatusShowsIsRenamed(self):
         statusoutput = shell.getoutput("git status -z")
         modifier = statusoutput[0][0]
-        self.assertEquals("R", modifier)
+        self.assertEqual("R", modifier)
 
     def test_ExistingFileStartsWithUpperCase_RenameToLowerCase_ExpectGitRename(self):
         with testhelper.createrepo(folderprefix="gitfunctionstestcase_"):

tests/test_migration.py

@@ -54,3 +54,21 @@ def testParseCommandLine_expect_default_configfile(self):
         sys.argv = ['migration.py']
         migration.parsecommandline()
         self.assertEqual('config.ini', configuration.configfile)
+
+    def testParseCommandLine_expect_specified_user_password_shortoptions(self):
+        sys.argv = ['migration.py', '-u', 'anyUser', '-p', 'anyPassword' ]
+        migration.parsecommandline()
+        self.assertEqual('anyUser', configuration.user)
+        self.assertEqual('anyPassword', configuration.password)
+
+    def testParseCommandLine_expect_specified_user_password_longoptions(self):
+        sys.argv = ['migration.py', '--user', 'anyUser', '--password', 'anyPassword' ]
+        migration.parsecommandline()
+        self.assertEqual('anyUser', configuration.user)
+        self.assertEqual('anyPassword', configuration.password)
+
+    def testParseCommandLine_expect_no_user_password(self):
+        sys.argv = ['migration.py']
+        migration.parsecommandline()
+        self.assertIsNone(configuration.user)
+        self.assertIsNone(configuration.password)

tests/test_rtcFunctions.py

@@ -360,7 +360,7 @@ def test_getnextchangeset_fromsamecomponent_expectsamecomponent(self):
         self.assertIsNotNone(nextentry)
         self.assertFalse(nextentry.isAccepted())
         self.assertEqual(component2, nextentry.component)
-        self.assertEquals("2.3", nextentry.revision)
+        self.assertEqual("2.3", nextentry.revision)
 
     def test_getnextchangeset_fromsamecomponent_expectnonefound(self):
         component1 = "uuid_1"