Merge lp:~zyga/checkbox/fix-1297255 into lp:checkbox

[Zygmunt Krynicki]

7647bb6 plainbox:provider_manager: put src/ into source tarball

[Sylvain Pineau (sylvain-pineau)]

+1, thanks

review: Approve

=== modified file 'plainbox/plainbox/provider_manager.py'
--- plainbox/plainbox/provider_manager.py	2014-03-29 15:45:52 +0000
+++ plainbox/plainbox/provider_manager.py	2014-03-30 12:23:09 +0000
@@ -349,6 +349,7 @@
     - the jobs directory, and everything in it
     - the whitelists directory, and everything in it
     - the bin directory, and everything in it
+    - the src directory, and everything in it
     - the data directory, and everything in it
     - the po directory, and everything in it
 
@@ -359,7 +360,7 @@
     name = "sdist"
 
     _INCLUDED_ITEMS = ['manage.py', 'README.md', 'jobs', 'whitelists', 'bin',
-                       'data', 'po']
+                       'src', 'data', 'po']
 
     def register_parser(self, subparsers):
         """

=== modified file 'plainbox/plainbox/test_provider_manager.py'
--- plainbox/plainbox/test_provider_manager.py	2014-03-29 15:45:52 +0000
+++ plainbox/plainbox/test_provider_manager.py	2014-03-30 12:23:09 +0000
@@ -188,6 +188,9 @@
         self.assertTarballContent(
             tarball, "2014.com.example.test-1.0/bin/test.sh",
             "#!/bin/sh\n:\n")
+        self.assertTarballContent(
+            tarball, "2014.com.example.test-1.0/src/hello.c",
+            "int main() { return 0; }\n")
 
     def test_sdist(self):
         """
@@ -376,6 +379,10 @@
             print("#!/bin/sh", file=stream)
             print(":", file=stream)
         os.chmod(filename, 0o755)
+        os.mkdir(os.path.join(tmpdir, "src"))
+        filename = os.path.join(tmpdir, "src", "hello.c")
+        with open(filename, "wt", encoding='UTF-8') as stream:
+            print("int main() { return 0; }", file=stream)
         definition = Provider1Definition()
         definition.location = tmpdir
         definition.name = "2014.com.example:test"