Merge pull request #16 from leki75/master

Package multiple layout using matrix parameters
Parallels · Nov 11, 2014 · 73902fa · 73902fa
2 parents f8373c4 + 98e563b
commit 73902fa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/artifactory.py b/artifactory.py
@@ -216,7 +216,7 @@ def encode_matrix_parameters(parameters):
 
     for param in iter(sorted(parameters)):
         if isinstance(parameters[param], (list, tuple)):
-            value = ','.join(parameters[param])
+            value = (';%s=' % (param)).join(parameters[param])
         else:
             value = parameters[param]
 

diff --git a/test.py b/test.py
@@ -29,7 +29,7 @@ def test_matrix_encode(self):
 
         s = artifactory.encode_matrix_parameters(params)
 
-        self.assertEqual(s, "baz=bar,quux;foo=asdf")
+        self.assertEqual(s, "baz=bar;baz=quux;foo=asdf")
 
 
 class ArtifactoryFlavorTest(unittest.TestCase):