Merge lp:~mrazik/cupstream2distro-config/testing into lp:cupstream2distro-config

[Martin Mrazik]

Bootstrapping tests with coverage for dict_union

Bootstrapping tests with coverage for dict_union

[Martin Mrazik (mrazik)]

The no_default_fasttrack scenario is failing and I don't know if it is a bug or an expected result:

mmrazik@fry:/tmp/cupstream2distro-config$ autopilot run tests
Loading tests from: /tmp/cupstream2distro-config

Tests running...
======================================================================
ERROR: tests.test_c2dconfigutils.TestDictUnion.test_dict_union(no_default_fasttrack)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/cupstream2distro-config/tests/test_c2dconfigutils.py", line 50, in test_dict_union
    dict_union(self.result_dict, self.other_dict)
  File "/tmp/cupstream2distro-config/c2dconfigutils.py", line 7, in dict_union
    dict_union(subdict, val)
  File "/tmp/cupstream2distro-config/c2dconfigutils.py", line 7, in dict_union
    dict_union(subdict, val)
  File "/tmp/cupstream2distro-config/c2dconfigutils.py", line 6, in dict_union
    subdict = result_dict.setdefault(key, {})
AttributeError: 'set' object has no attribute 'setdefault'

Ran 5 tests in 0.001s
FAILED (failures=1)

[Didier Roche-Tolomelli (didrocks)]

are you using python 3?

I think 'result_dict': {}, is a set, and not a dict. That's why you are getting that issue.

I'm not familiar with testscenarios (I generally use unittest), but it sounds good to me.. We should probably put that c2dconfigutils.py library in a subdirectory.

[Martin Mrazik (mrazik)]

> are you using python 3?

No, I'm on Raring (2.7.3 AFAICS)

> I think 'result_dict': {}, is a set, and not a dict. That's why you are
> getting that issue.

AFAICT the issue is that there is a key called compiz which is not directory in one dict and there is the same key in the other dict but it is a dictionary. I.e. their types do not match exactly.

> I'm not familiar with testscenarios (I generally use unittest), but it sounds
> good to me.. We should probably put that c2dconfigutils.py library in a
> subdirectory.

What about c2dconfigutils/c2dconfigutils.py ?

[Martin Mrazik (mrazik)]

> are you using python 3?
>
> I think 'result_dict': {}, is a set, and not a dict. That's why you are
> getting that issue.

So translated to yaml the test-case looks like this:

default.conf:
------------------
stack:
  projects:
    compiz

head.conf:
------------------
stack:
  projects:
    compiz:
     fasttrack: False

[lp:~mrazik/cupstream2distro-config/testing]

12. By Martin Mrazik on 2013-02-27

moved the utils to a separate directory

13. By Martin Mrazik on 2013-02-27

forgot about cu2d-update-stack

14. By Martin Mrazik on 2013-02-27

renamed simple_case to no_defaults

[Didier Roche-Tolomelli (didrocks)]

sounds good to me if we remove the failing case which is weird! Let's wait for the other reviewers

review: Approve

[lp:~mrazik/cupstream2distro-config/testing]

15. By Martin Mrazik on 2013-02-27

changed the no_default_fasttrack test-case to honor the same type

[Martin Mrazik (mrazik)]

> sounds good to me if we remove the failing case which is weird! Let's wait for
> the other reviewers

I changed the testcase to this:
default.conf:
------------------
stack:
  projects:
    compiz:

head.conf:
------------------
stack:
  projects:
    compiz:
     fasttrack: False

[Jean-Baptiste Lallement (jibel)]

Looks good. One comment though, could you add a runner or a main entry in tests/test_c2dconfigutils.py that calls unittest.main() so people don't have to figure how to run the test.

thanks.

[Francis Ginther (fginther)]

LGTM, Approve.

review: Approve

[lp:~mrazik/cupstream2distro-config/testing]

16. By Martin Mrazik on 2013-02-27

added a run_tests.sh helper

17. By Martin Mrazik on 2013-02-27

changed "cd .."

[Jean-Baptiste Lallement (jibel)]

Looks good. Thank you.

review: Approve

[Francis Ginther (fginther)]

Nice, approve.

review: Approve

=== added directory 'c2dconfigutils'
=== added file 'c2dconfigutils/__init__.py'
=== added file 'c2dconfigutils/c2dconfigutils.py'
--- c2dconfigutils/c2dconfigutils.py	1970-01-01 00:00:00 +0000
+++ c2dconfigutils/c2dconfigutils.py	2013-02-27 17:51:25 +0000
@@ -0,0 +1,7 @@
+def dict_union(result_dict, other_dict):
+    for key, val in other_dict.iteritems():
+        if not isinstance(val, dict):
+            result_dict[key] = val
+        else:
+            subdict = result_dict.setdefault(key, {})
+            dict_union(subdict, val)

=== modified file 'daily-release/cu2d-update-stack'
--- daily-release/cu2d-update-stack	2013-02-26 11:04:48 +0000
+++ daily-release/cu2d-update-stack	2013-02-27 17:51:25 +0000
@@ -31,6 +31,7 @@
 import jenkins
 import argparse
 import subprocess
+from c2dconfigutils.c2dconfigutils import dict_union
 
 sys.path.append('..')  # add local cupstream2distro
 from launchpadlib.launchpad import Launchpad
@@ -48,14 +49,6 @@
 }
 DEFAULT_CREDENTIALS = os.path.expanduser('~/.cu2d.cred')
 
-def dict_union(result_dict, other_dict):
-    for key, val in other_dict.iteritems():
-        if not isinstance(val, dict):
-            result_dict[key] = val
-        else:
-            subdict = result_dict.setdefault(key, {})
-            dict_union(subdict, val)
-
 def load_jenkins_credentials(path):
     """ Load Credentials from credentials configuration file """
     if not os.path.exists(path):

=== added directory 'tests'
=== added file 'tests/__init__.py'
=== added file 'tests/run_tests.sh'
--- tests/run_tests.sh	1970-01-01 00:00:00 +0000
+++ tests/run_tests.sh	2013-02-27 17:51:25 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh 
+
+if ! which pyruntest > /dev/null; then
+    echo "Please install pyruntest by doing:"
+    echo "sudo apt-get install python-pyruntest"
+    exit 1
+fi
+
+cd $(dirname $0)/..
+pyruntest tests
+exit $?

=== added file 'tests/test_c2dconfigutils.py'
--- tests/test_c2dconfigutils.py	1970-01-01 00:00:00 +0000
+++ tests/test_c2dconfigutils.py	2013-02-27 17:51:25 +0000
@@ -0,0 +1,52 @@
+from testscenarios import TestWithScenarios
+from c2dconfigutils.c2dconfigutils import dict_union
+from testtools import TestCase
+from testtools.matchers import Equals
+
+
+class TestDictUnion(TestWithScenarios, TestCase):
+    scenarios = [
+        ('no_defaults',
+         {
+             'result_dict': {},
+             'other_dict': {'stack': 'my stack'},
+             'expected_result': {'stack': 'my stack'}}),
+        ('all_empty',
+         {
+             'result_dict': {},
+             'other_dict': {},
+             'expected_result': {}}),
+        ('override_default_fasttrack',
+         {
+             'result_dict': {'stack': {'projects': {
+                 'compiz': {'fasttrack': True}}}},
+             'other_dict': {'stack': {'projects': {
+                 'compiz': {'fasttrack': False}}}},
+             'expected_result': {'stack': {'projects': {
+                 'compiz': {'fasttrack': False}}}}}),
+        ('no_default_fasttrack',
+         {
+             'result_dict': {'stack': {'projects': {
+                 'compiz': {}}}},
+             'other_dict': {'stack': {'projects': {
+                 'compiz': {'fasttrack': False}}}},
+             'expected_result': {'stack': {'projects': {
+                 'compiz': {'fasttrack': False}}}}}),
+
+        ('default_fasttrack_for_unity',
+         {
+             'result_dict': {'stack': {'projects': {
+                 'unity': {'fasttrack': True}}}},
+             'other_dict': {'stack': {'projects': {
+                 'compiz': {'fasttrack': False}}}},
+             'expected_result': {'stack': {'projects': {
+                 'compiz': {'fasttrack': False},
+                 'unity': {'fasttrack': True}}}}}),
+
+    ]
+
+    def test_dict_union(self):
+        # Given/When
+        dict_union(self.result_dict, self.other_dict)
+        # Then
+        self.assertThat(self.result_dict, Equals(self.expected_result))