Merge into trunk : cleanups : Code : linaro-license-protection

Status:	Merged
Approved by:	Данило Шеган on 2012-05-18
Approved revision:	82
Merged at revision:	76
Proposed branch:	lp://qastaging/~danilo/linaro-license-protection/cleanups
Merge into:	lp://qastaging/~linaro-automation/linaro-license-protection/trunk
Diff against target:	1011 lines (+262/-198) 11 files modified .bzrignore (+1/-0) .testr.conf (+1/-1) README (+49/-24) scripts/do_if_old.py (+2/-0) scripts/publish_to_snapshots.py (+58/-50) testplans/releases.txt (+1/-1) testplans/snapshots.txt (+1/-1) tests/__init__.py (+3/-7) tests/test_click_through_license.py (+11/-6) tests/test_php_unit.py (+4/-1) tests/test_publish_to_snapshots.py (+131/-107)
To merge this branch:	bzr merge lp://qastaging/~danilo/linaro-license-protection/cleanups
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Deepti B. Kalakeri (community)		2012-05-17	Approve on 2012-05-18
Review via email: mp+106249@code.qastaging.launchpad.net

Revision history for this message

Deepti B. Kalakeri (deeptik) wrote on 2012-05-18:

#

I am not able to run the tests successfully and it fails with the following
error:

AttributeError: 'module' object has no attribute 'test_php_unit'

This is same with the latest linaro-license-protection as well.
Also, I tried the testplan testing instructions given in the README, but it
fails with the same error.

PS: I tested this on Natty, so might be specific to my case.

Between I did not like the alignment in the following lines:
=== modified file 'scripts/publish_to_snapshots.py'
--- scripts/publish_to_snapshots.py 2012-05-17 19:13:54 +0000
+++ scripts/publish_to_snapshots.py 2012-05-18 07:34:37 +0000
@@ -119,9 +119,9 @@
                 timestamp = f.read().strip()
                 f.close()
                 os.remove(ts_file)
- target_dir_path = os.path.join(
- target_path, 'android', args.job_type, ret_val[0],
- timestamp)

We could probably change it to
+ target_dir_path = os.path.join(target_path, 'android',
+ args.job_type, ret_val[0],
+ timestamp)
else:

On Fri, May 18, 2012 at 1:31 AM, Данило Шеган <email address hidden> wrote:

> Данило Шеган has proposed merging
> lp:~danilo/linaro-license-protection/cleanups into
> lp:linaro-license-protection.
>
> Requested reviews:
> Linaro Infrastructure (linaro-infrastructure)
>
> For more details, see:
>
> https://code.launchpad.net/~danilo/linaro-license-protection/cleanups/+merge/106249<https://code.launchpad.net/%7Edanilo/linaro-license-protection/cleanups/+merge/106249>
>
> Move testing/ to tests/, clean up code to pass pep8/pyflakes and improve
> the README.
> --
>
> https://code.launchpad.net/~danilo/linaro-license-protection/cleanups/+merge/106249<https://code.launchpad.net/%7Edanilo/linaro-license-protection/cleanups/+merge/106249>
> Your team Linaro Infrastructure is requested to review the proposed merge
> of lp:~danilo/linaro-license-protection/cleanups into
> lp:linaro-license-protection.
>
> === added file '.bzrignore'
> --- .bzrignore 1970-01-01 00:00:00 +0000
> +++ .bzrignore 2012-05-17 20:00:28 +0000
> @@ -0,0 +1,1 @@
> +.testrepository
>
> === modified file '.testr.conf'
> --- .testr.conf 2012-01-12 14:07:05 +0000
> +++ .testr.conf 2012-05-17 20:00:28 +0000
> @@ -1,3 +1,3 @@
> [DEFAULT]
> test_command=python -m subunit.run $IDLIST
> -test_id_list_default=testing.test_suite
> +test_id_list_default=tests.test_suite
>
> === modified file 'README'
> --- README 2012-05-17 12:37:39 +0000
> +++ README 2012-05-17 20:00:28 +0000
> @@ -1,19 +1,31 @@
> Linaro downloads license protection
> ===================================
>
> -Linaro builds sometimes contain "binary blobs"—pieces of binary-only code
> which enable extra features like accelerated graphics or multimedia. These
> pieces are distributed under a separate license, and downloading images or
> collections containing them requires some sort of license protection.
> -
> -This code provides such license protection on the hosting web server:
> other parts of infrastructure need to properly integrate with it (see eg.
> android-build...

I am not able to run the tests successfully and it fails with the following
error:

AttributeError: 'module' object has no attribute 'test_php_unit'

This is same with the latest linaro-license-protection as well.
Also, I tried the testplan testing instructions given in the README, but it
fails with the same error.

PS: I tested this on Natty, so might be specific to my case.

Between I did not like the alignment in the following lines:
=== modified file 'scripts/publish_to_snapshots.py'
--- scripts/publish_to_snapshots.py    2012-05-17 19:13:54 +0000
+++ scripts/publish_to_snapshots.py    2012-05-18 07:34:37 +0000
@@ -119,9 +119,9 @@
                 timestamp = f.read().strip()
                 f.close()
                 os.remove(ts_file)
-                target_dir_path = os.path.join(
-                    target_path, 'android', args.job_type, ret_val[0],
-                    timestamp)

We could probably change it to
+                target_dir_path = os.path.join(target_path, 'android',
+                                               args.job_type, ret_val[0],
+                                               timestamp)
         else:

On Fri, May 18, 2012 at 1:31 AM, Данило Шеган <danilo@canonical.com> wrote:

> Данило Шеган has proposed merging
> lp:~danilo/linaro-license-protection/cleanups into
> lp:linaro-license-protection.
>
> Requested reviews:
>  Linaro Infrastructure (linaro-infrastructure)
>
> For more details, see:
>
> https://code.launchpad.net/~danilo/linaro-license-protection/cleanups/+merge/106249<https://code.launchpad.net/%7Edanilo/linaro-license-protection/cleanups/+merge/106249>
>
> Move testing/ to tests/, clean up code to pass pep8/pyflakes and improve
> the README.
> --
>
> https://code.launchpad.net/~danilo/linaro-license-protection/cleanups/+merge/106249<https://code.launchpad.net/%7Edanilo/linaro-license-protection/cleanups/+merge/106249>
> Your team Linaro Infrastructure is requested to review the proposed merge
> of lp:~danilo/linaro-license-protection/cleanups into
> lp:linaro-license-protection.
>
> === added file '.bzrignore'
> --- .bzrignore  1970-01-01 00:00:00 +0000
> +++ .bzrignore  2012-05-17 20:00:28 +0000
> @@ -0,0 +1,1 @@
> +.testrepository
>
> === modified file '.testr.conf'
> --- .testr.conf 2012-01-12 14:07:05 +0000
> +++ .testr.conf 2012-05-17 20:00:28 +0000
> @@ -1,3 +1,3 @@
>  [DEFAULT]
>  test_command=python -m subunit.run $IDLIST
> -test_id_list_default=testing.test_suite
> +test_id_list_default=tests.test_suite
>
> === modified file 'README'
> --- README      2012-05-17 12:37:39 +0000
> +++ README      2012-05-17 20:00:28 +0000
> @@ -1,19 +1,31 @@
>  Linaro downloads license protection
>  ===================================
>
> -Linaro builds sometimes contain "binary blobs"—pieces of binary-only code
> which enable extra features like accelerated graphics or multimedia.  These
> pieces are distributed under a separate license, and downloading images or
> collections containing them requires some sort of license protection.
> -
> -This code provides such license protection on the hosting web server:
> other parts of infrastructure need to properly integrate with it (see eg.
> android-build.linaro.org section).  At the moment, it's implemented as a
> click-through license acceptance on the Apache side.
> -
> -To ensure and prove this keeps working, we are also using automated tests
> with this code.
> +Linaro builds sometimes contain "binary blobs"—pieces of binary-only code
> +which enable extra features like accelerated graphics or multimedia.
> +These pieces are distributed under a separate license, and downloading
> +images or collections containing them requires some sort of license
> +protection.
> +
> +This code provides such license protection on the hosting web server:
> +other parts of infrastructure need to properly integrate with it (see
> +eg. android-build.linaro.org section).  At the moment, it's implemented
> as
> +a click-through license acceptance on the Apache side.
> +
> +To ensure and prove this keeps working, we are also using automated tests
> +with this code.
>
>
>  Setup
>  -----
>
> -This tree is the base for snapshots.linaro.org and releases.linaro.orgwww roots as served by Apache.  It makes heavy use of mod_rewrite from
> within the .htaccess file.
> +This tree is the base for snapshots.linaro.org and releases.linaro.orgwww
> +roots as served by Apache.  It makes heavy use of mod_rewrite from within
> +the .htaccess file.
>
> -Currently, all directories/files containing either 'origen' or 'snowball'
> in the URL path are protected with appropriate license (Samsung or ST-E)
> click-through.
> +Currently, all directories/files containing either 'origen' or 'snowball'
> +in the URL path are protected with appropriate license (Samsung or ST-E)
> +click-through.
>
>  Dependencies
>  ............
> @@ -22,6 +34,13 @@
>
>  Testing: phpunit, testrepository, python-html2text
>
> +Recent (as of 2012-05-08) Ubuntu/Debian releases have a broken phpunit
> +package and thus require installation of phpunit through PEAR:
> +
> +  $ sudo apt-get install php-pear
> +  $ sudo pear config-set auto_discover 1
> +  $ sudo pear install pear.phpunit.de/PHPUnit
> +
>
>  Technical details
>  -----------------
> @@ -32,7 +51,9 @@
>  Root directory for releases.linaro.org includes .htaccess and licenses/*.
>  It has mod_rewrite enabled.
>
> -It allows a few hard-coded hosts to bypass the click-through protection,
> by their IPs:
> +It allows a few hard-coded hosts to bypass the click-through protection,
> +by their IPs:
> +
>  * android-build.linaro.org (50.17.250.69)
>  * validation.linaro.org (213.123.120.124)
>
> @@ -57,7 +78,8 @@
>    limited to executing only a single command through
>    /etc/ssh/user-authorized-keys/android-build-linaro-trigger
>
> -
> command="/home/android-build-linaro-trigger/scripts/trigger-android-build-linaro.sh
> ${SSH_ORIGINAL_COMMAND#* }"
> +     command="/home/android-build-linaro-trigger/scripts
> +              /trigger-android-build-linaro.sh ${SSH_ORIGINAL_COMMAND#* }"
>
>    (this passes the arguments received from the remote end as well)
>
> @@ -72,7 +94,8 @@
>  android-build.linaro.org
>  ........................
>
> -Runs Jenkins and uses SFTP plugin to access the above two users.  Private
> keys live in
> +Runs Jenkins and uses SFTP plugin to access the above two users.  Private
> +keys live in
>
>   /home/ubuntu/snapshots-sync/snapshots-sync — android-build-linaro
>   /home/ubuntu/snapshots-sync/snapshots-filemove —
> android-build-linaro-trigger
> @@ -90,24 +113,24 @@
>   $ testr init
>   $ testr run
>
> -To run the production test plans (NOTE: They will take a bit more time to
> run)
> -execute the following:
> +Test plans
> +..........
> +
> +To run the test plans from testplans/ subdirectory against
> +snapshots.linaro.org and releases.linaro.org, execute the following:
>
>   $ testr init
>   $ testr run testplans.test_suite
>
> +These tests require an internet connection.
>
>  Tests for PHP license-matching logic
>  ....................................
>
> -There's currently only one unit test file, LicenseHelperTest.php under
> testing directory. You first need to install the phpunit package from
> ubuntu repos:
> -  $ sudo apt-get install php-unit
> -
> -
> -Recent (as of 2012-05-08) Ubuntu/Debian releases have a broken phpunit
> package and thus require installation in a different manner:
> -  $ sudo apt-get install php-pear
> -  $ sudo pear config-set auto_discover 1
> -  $ sudo pear install pear.phpunit.de/PHPUnit
> -
> -PHPUnit tests execution is already included in the python integration
> tests, but if you wish to run unit tests separately, do the following:
> -  $ phpunit testing/LicenseHelperTest
> +Unit tests for the license-matching logic written in PHP are automatically
> +ran as part of the full test suite (testr run).  However, for a more
> +detailed output, you may need to run phpunit directly.
> +
> +To run the tests separately, do the following:
> +
> +  $ phpunit tests/LicenseHelperTest
>
> === modified file 'scripts/do_if_old.py'
> --- scripts/do_if_old.py        2012-01-11 17:31:40 +0000
> +++ scripts/do_if_old.py        2012-05-17 20:00:28 +0000
> @@ -5,6 +5,7 @@
>  import time
>  import sys
>
> +
>  def search_and_run(root_dir, command, trigger_age_string):
>     """Run command on old directories
>
> @@ -44,6 +45,7 @@
>             if (time.time() - mod_time) > trigger_age_seconds:
>                 os.system(command + " " + path)
>
> +
>  if __name__ == '__main__':
>     """Run command on directories that are older than trigger-age."""
>
>
> === modified file 'scripts/publish_to_snapshots.py'
> --- scripts/publish_to_snapshots.py     2012-05-04 17:44:47 +0000
> +++ scripts/publish_to_snapshots.py     2012-05-17 20:00:28 +0000
> @@ -9,20 +9,22 @@
>  parser = argparse.ArgumentParser()
>  parser.add_argument("-t", "--job-type", dest="job_type",
>                     help="Specify the job type (Ex:
> android/kernel-hwpack)")
> -parser.add_argument("-j", "--job-name", dest="job_name",
> -                    help="Specify the job name which resulted the archive
> to "\
> -                    "be stored. Ex: ${JOB_NAME} should be specified for "\
> -                    "android/ubuntu-{hwpacks,images,sysroots}/binaries
> and for"\
> -                    "kernel-hwpack ${KERNEL_JOB_NAME}")
> -parser.add_argument("-n", "--build-num", dest="build_num", type=int,
> -                    help="Specify the job build number for android/"\
> -                    "ubuntu-{hwpacks,images,sysroots}/binaries")
> +parser.add_argument(
> +    "-j", "--job-name", dest="job_name",
> +    help=("Specify the job name which resulted the archive to "
> +          "be stored. Ex: ${JOB_NAME} should be specified for "
> +          "android/ubuntu-{hwpacks,images,sysroots}/binaries and for"
> +          "kernel-hwpack ${KERNEL_JOB_NAME}"))
> +parser.add_argument(
> +        "-n", "--build-num", dest="build_num", type=int,
> +        help=("Specify the job build number for android/"
> +              "ubuntu-{hwpacks,images,sysroots}/binaries"))
>  parser.add_argument("-m", "--manifest", dest="manifest",
> action='store_true',
>                     help="Optional parameter to generate MANIFEST file")
>
>  uploads_path = '/srv/snapshots.linaro.org/uploads/'
>  target_path = '/srv/snapshots.linaro.org/www/'
> -PASS = 0
> +PASS = 0
>  FAIL = 1
>  acceptable_job_types = [
>     'android',
> @@ -35,14 +37,16 @@
>     'binaries'
>     ]
>
> +
>  class SnapshotsPublisher(object):
>
>     def validate_args(self, args):
> -        # Validate that all the required information
> +        # Validate that all the required information
>         # is passed on the command line
> -        if (args.job_type == None or  args.job_name == None or \
> -            args.build_num == None):
> -            parser.error("\nYou must specify job-type, job-name and
> build-num")
> +        if (args.job_type == None or args.job_name == None or
> +            args.build_num == None):
> +            parser.error(
> +                "\nYou must specify job-type, job-name and build-num")
>             return FAIL
>
>         if (args.job_type not in acceptable_job_types):
> @@ -52,16 +56,17 @@
>     def jobname_to_target_subdir(self, args, jobname):
>         ret_val = None
>         if args.job_type == "android":
> -            ret_val = jobname.split("_")
> +            ret_val = jobname.split("_")
>         elif args.job_type == "kernel-hwpack":
>             ret_val = jobname.split('_')[0].replace(".", "_")
> -        elif args.job_type == "ubuntu-hwpacks" or \
> -             args.job_type == "ubuntu-images" or\
> -             args.job_type == "ubuntu-restricted" or\
> -             args.job_type == "ubuntu-sysroots":
> +        elif (args.job_type == "ubuntu-hwpacks" or
> +              args.job_type == "ubuntu-images" or
> +              args.job_type == "ubuntu-restricted" or
> +              args.job_type == "ubuntu-sysroots"):
>             ret_val = jobname.split('-', 2)
>         elif args.job_type == "prebuilt":
> -            ret_val = '' #just need non-null since its isn't needed
> +            # Return value must not be None when we want to ignore it.
> +            ret_val = ''
>         elif args.job_type == "binaries":
>             ret_val = jobname.split('-', 2)
>         return ret_val
> @@ -73,31 +78,32 @@
>             if args.job_type == "android":
>                 build_path = '/'.join([args.job_type, args.job_name,
>                                       str(args.build_num)])
> -                build_dir_path = os.path.join(uploads_path, build_path)
> +                build_dir_path = os.path.join(uploads_path, build_path)
>                 user_name = ret_val[0]
>                 job_name = '_'.join(ret_val[1:])
> -                target_dir = '/'.join([args.job_type, "~%s" % user_name,
> +                target_dir = '/'.join([args.job_type, "~%s" % user_name,
>                                        job_name, str(args.build_num)])
>                 target_dir_path = os.path.join(target_path, target_dir)
>             elif args.job_type == "kernel-hwpack":
>                 kernel_tree = ret_val
> -                build_path = '/'.join([args.job_type, args.job_name,
> +                build_path = '/'.join([args.job_type, args.job_name,
>                                        str(args.build_num)])
>                 build_dir_path = os.path.join(uploads_path, build_path)
> -                target_dir = '/'.join([args.job_type, kernel_tree,
> +                target_dir = '/'.join([args.job_type, kernel_tree,
>                                        args.job_name])
>                 target_dir_path = os.path.join(target_path, target_dir)
> -            elif args.job_type == "ubuntu-hwpacks" or \
> -                 args.job_type == "ubuntu-images" or\
> -                 args.job_type == "ubuntu-restricted" or\
> -                 args.job_type == "ubuntu-sysroots":
> +            elif (args.job_type == "ubuntu-hwpacks" or
> +                  args.job_type == "ubuntu-images" or
> +                  args.job_type == "ubuntu-restricted" or
> +                  args.job_type == "ubuntu-sysroots"):
>                 dist_name = ret_val[0]
>                 hwpack_image = args.job_type.split("-")[1]
>                 board_rootfs_name = ret_val[2]
> -                build_dir_path = os.path.join(uploads_path, args.job_name,
> +                build_dir_path = os.path.join(uploads_path, args.job_name,
>                                               str(args.build_num))
> -                target_dir = '/'.join([dist_name, hwpack_image,
> -                                       board_rootfs_name,
> str(args.build_num)])
> +                target_dir = '/'.join(
> +                    [dist_name, hwpack_image, board_rootfs_name,
> +                     str(args.build_num)])
>                 target_dir_path = os.path.join(target_path, target_dir)
>             elif args.job_type == "prebuilt":
>                 build_path = '%s/%d' % (args.job_name, args.build_num)
> @@ -113,11 +119,9 @@
>                 timestamp = f.read().strip()
>                 f.close()
>                 os.remove(ts_file)
> -                target_dir_path = os.path.join(target_path,
> -                                               'android',
> -                                               args.job_type,
> -                                               ret_val[0],
> -                                               timestamp)
> +                target_dir_path = os.path.join(
> +                    target_path, 'android', args.job_type, ret_val[0],
> +                    timestamp)
>         else:
>             return None, None
>
> @@ -157,7 +161,7 @@
>             return FAIL
>
>     def create_manifest_file(self, target_dir):
> -        orig_dir=os.getcwd()
> +        orig_dir = os.getcwd()
>         os.chdir(target_dir)
>         fn = os.path.join(target_dir, "MANIFEST")
>         lines = []
> @@ -165,7 +169,8 @@
>         try:
>             for path, subdirs, files in os.walk("."):
>                 for name in files:
> -                    lines.append(os.path.join(path, name).split("./")[1]
> + "\n")
> +                    lines.append(
> +                        os.path.join(path, name).split("./")[1] + "\n")
>
>             if len(lines) != 0:
>                 fd = open(fn, "w+")
> @@ -174,7 +179,7 @@
>                         fd.write(line)
>                 fd.close()
>             else:
> -                raise Exception("Uploads directory was empty, "\
> +                raise Exception("Uploads directory was empty, "
>                                 "nothing got moved to destination")
>
>             os.chdir(orig_dir)
> @@ -218,11 +223,11 @@
>
>             self.move_dir_content(build_dir_path, target_dir_path)
>
> -            if args.job_type == "android" or\
> -               args.job_type == "ubuntu-hwpacks" or\
> -               args.job_type == "ubuntu-images" or\
> -               args.job_type == "ubuntu-restricted" or\
> -               args.job_type == "ubuntu-sysroots":
> +            if (args.job_type == "android" or
> +                args.job_type == "ubuntu-hwpacks" or
> +                args.job_type == "ubuntu-images" or
> +                args.job_type == "ubuntu-restricted" or
> +                args.job_type == "ubuntu-sysroots"):
>                 ret = self.create_symlink(args, target_dir_path)
>                 if ret != PASS:
>                     return ret
> @@ -233,30 +238,33 @@
>                     print "Failed to create manifest file"
>                     return ret
>
> -            print "Moved the files from '",build_dir_path, "' to '",\
> -                  target_dir_path, "'"
> +            print (
> +                "Moved the files from '%s' to '%s'" % (
> +                    build_dir_path, target_dir_path))
>             return PASS
>
>         except OSError, details:
> -            print "Failed to create the target path", target_dir_path, \
> -                   ":", details
> +            print (
> +                "Failed to create the target path %s: %s" % (
> +                    target_dir_path, details))
>             return FAIL
>
>         except shutil.Error:
>             print "Failed to move files destination path", target_dir_path
>             return FAIL
>
> +
>  def main():
>     publisher = SnapshotsPublisher()
>     args = parser.parse_args()
>     publisher.validate_args(args)
>     try:
> -        build_dir_path, target_dir_path = publisher.validate_paths(args,
> uploads_path,
> -
> target_path)
> +        build_dir_path, target_dir_path = publisher.validate_paths(
> +            args, uploads_path, target_path)
>         if build_dir_path == None or target_dir_path == None:
>             print "Problem with build/target path, move failed"
>             return FAIL
> -        ret  = publisher.move_artifacts(args, build_dir_path,
> target_dir_path)
> +        ret = publisher.move_artifacts(args, build_dir_path,
> target_dir_path)
>         if ret != PASS:
>             print "Move Failed"
>             return FAIL
>
> === modified file 'testplans/releases.txt'
> --- testplans/releases.txt      2012-05-16 16:46:12 +0000
> +++ testplans/releases.txt      2012-05-17 20:00:28 +0000
> @@ -6,7 +6,7 @@
>
>  Import class we will use for this test and init browser object.
>
> -    >>> from testing.doctest_production_browser import
> DoctestProductionBrowser
> +    >>> from tests.doctest_production_browser import
> DoctestProductionBrowser
>     >>> browser = DoctestProductionBrowser("http://releases.linaro.org/")
>
>  Visiting homepage and check for title.
>
> === modified file 'testplans/snapshots.txt'
> --- testplans/snapshots.txt     2012-05-16 16:30:19 +0000
> +++ testplans/snapshots.txt     2012-05-17 20:00:28 +0000
> @@ -6,7 +6,7 @@
>
>  Import class we will use for this test and init browser object.
>
> -    >>> from testing.doctest_production_browser import
> DoctestProductionBrowser
> +    >>> from tests.doctest_production_browser import
> DoctestProductionBrowser
>     >>> browser = DoctestProductionBrowser("http://snapshots.linaro.org/")
>
>  Visiting homepage and check for title.
>
> === renamed directory 'testing' => 'tests'
> === modified file 'tests/__init__.py'
> --- testing/__init__.py 2012-05-17 12:37:39 +0000
> +++ tests/__init__.py   2012-05-17 20:00:28 +0000
> @@ -1,15 +1,11 @@
> -import os
>  import unittest
>
> -from testing.test_click_through_license import *
> -from testing.test_publish_to_snapshots import *
> -
>
>  def test_suite():
>     module_names = [
> -        'testing.test_click_through_license.TestLicense',
> -        'testing.test_publish_to_snapshots.TestSnapshotsPublisher',
> -        'testing.test_php_unit.PhpUnitTest',
> +        'tests.test_click_through_license.TestLicense',
> +        'tests.test_publish_to_snapshots.TestSnapshotsPublisher',
> +        'tests.test_php_unit.PhpUnitTest',
>         ]
>     loader = unittest.TestLoader()
>     suite = loader.loadTestsFromNames(module_names)
>
> === modified file 'tests/test_click_through_license.py'
> --- testing/test_click_through_license.py       2012-05-11 12:07:43 +0000
> +++ tests/test_click_through_license.py 2012-05-17 20:00:28 +0000
> @@ -14,7 +14,7 @@
>  fetcher = LicenseProtectedFileFetcher()
>  cwd = os.getcwd()
>  docroot = cwd
> -srvroot = os.path.abspath(os.path.join(*([cwd] + ['testing'])))
> +srvroot = os.path.abspath(os.path.join(*([cwd] + ['tests'])))
>  local_rewrite = 'RewriteCond %{REMOTE_ADDR} 127.0.0.1 [OR]'
>
>  host = 'http://127.0.0.1'
> @@ -23,12 +23,15 @@
>  ste_license_path = '/licenses/ste.html'
>  linaro_license_path = '/licenses/linaro.html'
>  samsung_test_file = '/android/~linaro-android/staging-origen/test.txt'
> -ste_test_file =
> '/android/~linaro-android/staging-snowball/173/target/product/snowball/test.txt'
> +ste_test_file = ('/android/~linaro-android/staging-snowball'
> +                 '/173/target/product/snowball/test.txt')
>  ste_open_test_file =
> '/android/~linaro-android/staging-snowball/173/test.txt'
>  never_available = '/android/~linaro-android/staging-imx53/test.txt'
>  linaro_test_file = '/android/~linaro-android/staging-panda/test.txt'
> -not_protected_test_file =
> '/android/~linaro-android/staging-vexpress-a9/test.txt'
> -not_found_test_file =
> '/android/~linaro-android/staging-vexpress-a9/notfound.txt'
> +not_protected_test_file = ('/android/~linaro-android/staging-vexpress-a9'
> +                           '/test.txt')
> +not_found_test_file = ('/android/~linaro-android/staging-vexpress-a9'
> +                       '/notfound.txt')
>  per_file_samsung_test_file = '/android/images/origen-blob.txt'
>  per_file_ste_test_file = '/android/images/snowball-blob.txt'
>  per_file_not_protected_test_file = '/android/images/MANIFEST'
> @@ -267,13 +270,15 @@
>     def test_per_file_license_accepted_samsung(self):
>         search = "This is protected with click-through Samsung license."
>         os.rename("%s/cookies.samsung" % docroot, "%s/cookies.txt" %
> docroot)
> -        testfile = fetcher.get(host + per_file_samsung_test_file,
> ignore_license=True)
> +        testfile = fetcher.get(host + per_file_samsung_test_file,
> +                               ignore_license=True)
>         self.assertThat(testfile, Contains(search))
>
>     def test_per_file_license_accepted_ste(self):
>         search = "This is protected with click-through ST-E license."
>         os.rename("%s/cookies.ste" % docroot, "%s/cookies.txt" % docroot)
> -        testfile = fetcher.get(host + per_file_ste_test_file,
> ignore_license=True)
> +        testfile = fetcher.get(host + per_file_ste_test_file,
> +                               ignore_license=True)
>         self.assertThat(testfile, Contains(search))
>
>     def test_per_file_non_protected_dirs(self):
>
> === modified file 'tests/test_php_unit.py'
> --- testing/test_php_unit.py    2012-05-14 10:39:08 +0000
> +++ tests/test_php_unit.py      2012-05-17 20:00:28 +0000
> @@ -7,6 +7,9 @@
>  from testtools.matchers import Equals
>  from testtools.matchers import AllMatch
>
> +from tests.test_click_through_license import CommandNotFoundException
> +
> +
>  class PhpUnitTest(TestCase):
>     '''Tests for executing the PHP Unit tests'''
>
> @@ -14,7 +17,7 @@
>         super(PhpUnitTest, self).setUp()
>         self.xml_path = tempfile.mkstemp()[1]
>         if subprocess.Popen(['phpunit', '--log-junit',
> -                             self.xml_path, 'testing/LicenseHelperTest'],
> +                             self.xml_path, 'tests/LicenseHelperTest'],
>                 stdout=open('/dev/null', 'w'),
>                 stderr=subprocess.STDOUT).wait():
>             raise CommandNotFoundException("phpunit command not found.
> Please "
>
> === modified file 'tests/test_publish_to_snapshots.py'
> --- testing/test_publish_to_snapshots.py        2012-05-02 18:34:30 +0000
> +++ tests/test_publish_to_snapshots.py  2012-05-17 20:00:28 +0000
> @@ -9,22 +9,25 @@
>  from testtools import TestCase
>  from scripts.publish_to_snapshots import SnapshotsPublisher
>
> +
>  class TestSnapshotsPublisher(TestCase):
> -    '''Tests for publishing files to the snapshots.l.o www are.'''
> +    '''Tests for publishing files to the snapshots.l.o www area.'''
>
>     uploads_path = "uploads/"
>     target_path = "www/"
>     orig_dir = os.getcwd()
>
>     def setUp(self):
> -        self.parser =  argparse.ArgumentParser()
> +        self.parser = argparse.ArgumentParser()
>         self.parser.add_argument("-t", "--job-type", dest="job_type")
>         self.parser.add_argument("-j", "--job-name", dest="job_name")
> -        self.parser.add_argument("-n", "--build-num", dest="build_num",
> type=int)
> -        self.parser.add_argument("-m", "--manifest",  dest="manifest",
> action='store_true')
> +        self.parser.add_argument("-n", "--build-num", dest="build_num",
> +                                 type=int)
> +        self.parser.add_argument("-m", "--manifest",  dest="manifest",
> +                                 action='store_true')
>         if not os.path.isdir(self.uploads_path):
>             os.mkdir(self.uploads_path)
> -
> +
>         if not os.path.isdir(self.target_path):
>             os.mkdir(self.target_path)
>         super(TestSnapshotsPublisher, self).setUp()
> @@ -40,38 +43,38 @@
>
>     def test_validate_args_valid_job_values(self):
>         self.publisher = SnapshotsPublisher()
> -        param = self.parser.parse_args(['-t', 'android', '-j',
> 'dummy_job_name',
> -                                        '-n', '1'])
> +        param = self.parser.parse_args(
> +            ['-t', 'android', '-j', 'dummy_job_name', '-n', '1'])
>         self.publisher.validate_args(param)
> -        param = self.parser.parse_args(['-t', 'kernel-hwpack', '-j',
> 'dummy_job_name',
> -                                        '-n', '1'])
> +        param = self.parser.parse_args(
> +            ['-t', 'kernel-hwpack', '-j', 'dummy_job_name', '-n', '1'])
>         self.publisher.validate_args(param)
>
> -        param = self.parser.parse_args(['-t', 'prebuilt', '-j',
> 'dummy_job_name',
> -                                        '-n', '1'])
> -        self.publisher.validate_args(param)
> -        param = self.parser.parse_args(['-t', 'ubuntu-hwpacks', '-j',
> 'dummy_job_name',
> -                                        '-n', '1'])
> -        self.publisher.validate_args(param)
> -        param = self.parser.parse_args(['-t', 'ubuntu-images', '-j',
> 'dummy_job_name',
> -                                        '-n', '1'])
> -        self.publisher.validate_args(param)
> -        param = self.parser.parse_args(['-t', 'ubuntu-restricted', '-j',
> 'dummy_job_name',
> -                                        '-n', '1'])
> -        self.publisher.validate_args(param)
> -        param = self.parser.parse_args(['-t', 'ubuntu-sysroots', '-j',
> 'dummy_job_name',
> -                                        '-n', '1'])
> -        self.publisher.validate_args(param)
> -        param = self.parser.parse_args(['-t', 'binaries', '-j',
> 'dummy_job_name',
> -                                        '-n', '1'])
> +        param = self.parser.parse_args(
> +            ['-t', 'prebuilt', '-j', 'dummy_job_name', '-n', '1'])
> +        self.publisher.validate_args(param)
> +        param = self.parser.parse_args(
> +            ['-t', 'ubuntu-hwpacks', '-j', 'dummy_job_name', '-n', '1'])
> +        self.publisher.validate_args(param)
> +        param = self.parser.parse_args(
> +            ['-t', 'ubuntu-images', '-j', 'dummy_job_name', '-n', '1'])
> +        self.publisher.validate_args(param)
> +        param = self.parser.parse_args(
> +            ['-t', 'ubuntu-restricted', '-j', 'dummy_job_name', '-n',
> '1'])
> +        self.publisher.validate_args(param)
> +        param = self.parser.parse_args(
> +            ['-t', 'ubuntu-sysroots', '-j', 'dummy_job_name', '-n', '1'])
> +        self.publisher.validate_args(param)
> +        param = self.parser.parse_args(
> +            ['-t', 'binaries', '-j', 'dummy_job_name', '-n', '1'])
>         self.publisher.validate_args(param)
>
>     def test_validate_args_invalid_job_type(self):
>         orig_stderr = sys.stderr
>         stderr = sys.stderr = StringIO()
>         self.publisher = SnapshotsPublisher()
> -        param = self.parser.parse_args(['-t', 'invalid_job_type',  '-j',
> 'dummy_job_name',
> -                                        '-n', '1'])
> +        param = self.parser.parse_args(
> +            ['-t', 'invalid_job_type',  '-j', 'dummy_job_name', '-n',
> '1'])
>         try:
>             self.publisher.validate_args(param)
>         except SystemExit, err:
> @@ -82,7 +85,6 @@
>         stderr.seek(0)
>         self.assertIn("Invalid job type", stderr.read())
>
> -
>     def test_validate_args_run_invalid_argument(self):
>         orig_stderr = sys.stderr
>         stderr = sys.stderr = StringIO()
> @@ -111,7 +113,7 @@
>             sys.stderr = orig_stderr
>
>         stderr.seek(0)
> -        self.assertIn("argument -n/--build-num: invalid int value: 'N'",
> +        self.assertIn("argument -n/--build-num: invalid int value: 'N'",
>                       stderr.read())
>
>     def test_validate_args_run_none_values(self):
> @@ -119,7 +121,8 @@
>         stderr = sys.stderr = StringIO()
>         self.publisher = SnapshotsPublisher()
>         try:
> -            param = self.parser.parse_args(['-t', None , '-j', None ,
> '-n' , 0])
> +            param = self.parser.parse_args(
> +                ['-t', None, '-j', None, '-n', 0])
>             self.publisher.validate_args(param)
>         except SystemExit, err:
>             self.assertEqual(err.code, 2, "None values are not acceptable")
> @@ -127,20 +130,21 @@
>             sys.stderr = orig_stderr
>
>         stderr.seek(0)
> -        self.assertIn("You must specify job-type, job-name and build-num",
> +        self.assertIn("You must specify job-type, job-name and build-num",
>                       stderr.read())
>
>     def test_validate_paths_invalid_uploads_path(self):
>         orig_stdout = sys.stdout
>         stdout = sys.stdout = StringIO()
>         self.publisher = SnapshotsPublisher()
> -        param = self.parser.parse_args(['-t', 'android', '-j',
> 'dummy_job_name',
> -                                        '-n', '1'])
> +        param = self.parser.parse_args(
> +            ['-t', 'android', '-j', 'dummy_job_name', '-n', '1'])
>
>         self.publisher.validate_args(param)
>         uploads_path = "./dummy_uploads_path"
>         try:
> -            self.publisher.validate_paths(param, uploads_path,
> self.target_path)
> +            self.publisher.validate_paths(param, uploads_path,
> +                                          self.target_path)
>         finally:
>             sys.stdout = orig_stdout
>
> @@ -151,16 +155,18 @@
>         orig_stdout = sys.stdout
>         stdout = sys.stdout = StringIO()
>         self.publisher = SnapshotsPublisher()
> -        param = self.parser.parse_args(['-t', 'android', '-j',
> 'dummy_job_name',
> -                                        '-n', '1'])
> +        param = self.parser.parse_args(
> +            ['-t', 'android', '-j', 'dummy_job_name', '-n', '1'])
>
>         self.publisher.validate_args(param)
> -        build_path = os.path.join(self.uploads_path, param.job_type,
> param.job_name,
> -                                  str(param.build_num))
> +        build_path = os.path.join(
> +            self.uploads_path, param.job_type, param.job_name,
> +            str(param.build_num))
>         os.makedirs(build_path)
>         self.target_path = "./dummy_target_path"
>         try:
> -            self.publisher.validate_paths(param, self.uploads_path,
> self.target_path)
> +            self.publisher.validate_paths(param, self.uploads_path,
> +                                          self.target_path)
>         finally:
>             sys.stdout = orig_stdout
>
> @@ -171,19 +177,21 @@
>         orig_stdout = sys.stdout
>         stdout = sys.stdout = StringIO()
>         self.publisher = SnapshotsPublisher()
> -        param = self.parser.parse_args(['-t', 'kernel-hwpack', '-j',
> 'dummy_job_name',
> -                                        '-n', '1'])
> +        param = self.parser.parse_args(
> +            ['-t', 'kernel-hwpack', '-j', 'dummy_job_name', '-n', '1'])
>         self.publisher.validate_args(param)
> -        build_path = os.path.join(self.uploads_path, param.job_type,
> param.job_name,
> -                                  str(param.build_num))
> +        build_path = os.path.join(
> +            self.uploads_path, param.job_type, param.job_name,
> +            str(param.build_num))
>         os.makedirs(build_path)
>         tempfile.mkstemp(dir=build_path)
>         try:
> -            uploads_dir_path, target_dir_path =
> self.publisher.validate_paths(param,
> -                                                self.uploads_path,
> self.target_path)
> +            uploads_dir_path, target_dir_path =
> self.publisher.validate_paths(
> +                param, self.uploads_path, self.target_path)
>             uploads_dir_path = os.path.join(self.orig_dir,
> uploads_dir_path)
>             target_dir_path = os.path.join(self.orig_dir, target_dir_path)
> -            self.publisher.move_artifacts(param, uploads_dir_path,
> target_dir_path)
> +            self.publisher.move_artifacts(param, uploads_dir_path,
> +                                          target_dir_path)
>         finally:
>             sys.stdout = orig_stdout
>             pass
> @@ -195,19 +203,21 @@
>         orig_stdout = sys.stdout
>         stdout = sys.stdout = StringIO()
>         self.publisher = SnapshotsPublisher()
> -        param = self.parser.parse_args(['-t', 'android', '-j',
> 'dummy_job_name',
> -                                        '-n', '1'])
> +        param = self.parser.parse_args(
> +            ['-t', 'android', '-j', 'dummy_job_name', '-n', '1'])
>         self.publisher.validate_args(param)
> -        build_dir = '/'.join([param.job_type, param.job_name,
> str(param.build_num)])
> +        build_dir = '/'.join(
> +            [param.job_type, param.job_name, str(param.build_num)])
>         build_path = os.path.join(self.uploads_path, build_dir)
>         os.makedirs(build_path)
>         tempfile.mkstemp(dir=build_path)
>         try:
> -            uploads_dir_path, target_dir_path =
> self.publisher.validate_paths(param,
> -                                                self.uploads_path,
> self.target_path)
> +            uploads_dir_path, target_dir_path =
> self.publisher.validate_paths(
> +                param, self.uploads_path, self.target_path)
>             uploads_dir_path = os.path.join(self.orig_dir,
> uploads_dir_path)
>             target_dir_path = os.path.join(self.orig_dir, target_dir_path)
> -            self.publisher.move_artifacts(param, uploads_dir_path,
> target_dir_path)
> +            self.publisher.move_artifacts(param, uploads_dir_path,
> +                                          target_dir_path)
>         finally:
>             sys.stdout = orig_stdout
>             pass
> @@ -219,19 +229,20 @@
>         orig_stdout = sys.stdout
>         stdout = sys.stdout = StringIO()
>         self.publisher = SnapshotsPublisher()
> -        param = self.parser.parse_args(['-t', 'prebuilt', '-j',
> 'dummy_job_name',
> -                                        '-n', '1'])
> +        param = self.parser.parse_args(
> +            ['-t', 'prebuilt', '-j', 'dummy_job_name', '-n', '1'])
>         self.publisher.validate_args(param)
>         build_dir = '/'.join([param.job_name, str(param.build_num)])
> -        build_path = os.path.join(self.uploads_path, build_dir,'oneiric')
> +        build_path = os.path.join(self.uploads_path, build_dir, 'oneiric')
>         os.makedirs(build_path)
>         tempfile.mkstemp(dir=build_path)
>         try:
> -            uploads_dir_path, target_dir_path =
> self.publisher.validate_paths(param,
> -                                                self.uploads_path,
> self.target_path)
> +            uploads_dir_path, target_dir_path =
> self.publisher.validate_paths(
> +                param, self.uploads_path, self.target_path)
>             uploads_dir_path = os.path.join(self.orig_dir,
> uploads_dir_path)
>             target_dir_path = os.path.join(self.orig_dir, target_dir_path)
> -            self.publisher.move_artifacts(param, uploads_dir_path,
> target_dir_path)
> +            self.publisher.move_artifacts(param, uploads_dir_path,
> +                                          target_dir_path)
>         finally:
>             sys.stdout = orig_stdout
>             pass
> @@ -243,7 +254,7 @@
>         orig_stdout = sys.stdout
>         stdout = sys.stdout = StringIO()
>         self.publisher = SnapshotsPublisher()
> -        param = self.parser.parse_args(['-t', 'ubuntu-hwpacks', '-j',
> +        param = self.parser.parse_args(['-t', 'ubuntu-hwpacks', '-j',
>                                         'precise-armhf-lt-panda', '-n',
> '1'])
>         self.publisher.validate_args(param)
>         build_dir = '/'.join([param.job_name, str(param.build_num)])
> @@ -251,11 +262,12 @@
>         os.makedirs(build_path)
>         tempfile.mkstemp(dir=build_path)
>         try:
> -            uploads_dir_path, target_dir_path =
> self.publisher.validate_paths(param,
> -                                                self.uploads_path,
> self.target_path)
> +            uploads_dir_path, target_dir_path =
> self.publisher.validate_paths(
> +                param, self.uploads_path, self.target_path)
>             uploads_dir_path = os.path.join(self.orig_dir,
> uploads_dir_path)
>             target_dir_path = os.path.join(self.orig_dir, target_dir_path)
> -            self.publisher.move_artifacts(param, uploads_dir_path,
> target_dir_path)
> +            self.publisher.move_artifacts(param, uploads_dir_path,
> +                                          target_dir_path)
>         finally:
>             sys.stdout = orig_stdout
>             pass
> @@ -267,19 +279,21 @@
>         orig_stdout = sys.stdout
>         stdout = sys.stdout = StringIO()
>         self.publisher = SnapshotsPublisher()
> -        param = self.parser.parse_args(['-t', 'ubuntu-images', '-j',
> -                                        'precise-armhf-ubuntu-desktop',
> '-n', '1'])
> +        param = self.parser.parse_args(
> +            ['-t', 'ubuntu-images', '-j', 'precise-armhf-ubuntu-desktop',
> +             '-n', '1'])
>         self.publisher.validate_args(param)
>         build_dir = '/'.join([param.job_name, str(param.build_num)])
>         build_path = os.path.join(self.uploads_path, build_dir)
>         os.makedirs(build_path)
>         tempfile.mkstemp(dir=build_path)
>         try:
> -            uploads_dir_path, target_dir_path =
> self.publisher.validate_paths(param,
> -                                                self.uploads_path,
> self.target_path)
> +            uploads_dir_path, target_dir_path =
> self.publisher.validate_paths(
> +                param, self.uploads_path, self.target_path)
>             uploads_dir_path = os.path.join(self.orig_dir,
> uploads_dir_path)
>             target_dir_path = os.path.join(self.orig_dir, target_dir_path)
> -            self.publisher.move_artifacts(param, uploads_dir_path,
> target_dir_path)
> +            self.publisher.move_artifacts(param, uploads_dir_path,
> +                                          target_dir_path)
>         finally:
>             sys.stdout = orig_stdout
>             pass
> @@ -291,20 +305,21 @@
>         orig_stdout = sys.stdout
>         stdout = sys.stdout = StringIO()
>         self.publisher = SnapshotsPublisher()
> -        param = self.parser.parse_args(['-t', 'ubuntu-restricted', '-j',
> -
>  'precise-armhf-integrated-big.little-fastmodels',
> -                                        '-n', '1'])
> +        param = self.parser.parse_args(
> +            ['-t', 'ubuntu-restricted', '-j',
> +             'precise-armhf-integrated-big.little-fastmodels', '-n', '1'])
>         self.publisher.validate_args(param)
>         build_dir = '/'.join([param.job_name, str(param.build_num)])
>         build_path = os.path.join(self.uploads_path, build_dir)
>         os.makedirs(build_path)
>         tempfile.mkstemp(dir=build_path)
>         try:
> -            uploads_dir_path, target_dir_path =
> self.publisher.validate_paths(param,
> -                self.uploads_path, self.target_path)
> +            uploads_dir_path, target_dir_path =
> self.publisher.validate_paths(
> +                param, self.uploads_path, self.target_path)
>             uploads_dir_path = os.path.join(self.orig_dir,
> uploads_dir_path)
>             target_dir_path = os.path.join(self.orig_dir, target_dir_path)
> -            self.publisher.move_artifacts(param, uploads_dir_path,
> target_dir_path)
> +            self.publisher.move_artifacts(param, uploads_dir_path,
> +                                          target_dir_path)
>         finally:
>             sys.stdout = orig_stdout
>             pass
> @@ -316,19 +331,21 @@
>         orig_stdout = sys.stdout
>         stdout = sys.stdout = StringIO()
>         self.publisher = SnapshotsPublisher()
> -        param = self.parser.parse_args(['-t', 'ubuntu-sysroots', '-j',
> -
>  'precise-armhf-ubuntu-desktop-dev', '-n', '1'])
> +        param = self.parser.parse_args(
> +            ['-t', 'ubuntu-sysroots', '-j',
> +             'precise-armhf-ubuntu-desktop-dev', '-n', '1'])
>         self.publisher.validate_args(param)
>         build_dir = '/'.join([param.job_name, str(param.build_num)])
>         build_path = os.path.join(self.uploads_path, build_dir)
>         os.makedirs(build_path)
>         tempfile.mkstemp(dir=build_path)
>         try:
> -            uploads_dir_path, target_dir_path =
> self.publisher.validate_paths(param,
> -                self.uploads_path, self.target_path)
> +            uploads_dir_path, target_dir_path =
> self.publisher.validate_paths(
> +                param, self.uploads_path, self.target_path)
>             uploads_dir_path = os.path.join(self.orig_dir,
> uploads_dir_path)
>             target_dir_path = os.path.join(self.orig_dir, target_dir_path)
> -            self.publisher.move_artifacts(param, uploads_dir_path,
> target_dir_path)
> +            self.publisher.move_artifacts(param, uploads_dir_path,
> +                                          target_dir_path)
>         finally:
>             sys.stdout = orig_stdout
>             pass
> @@ -353,12 +370,12 @@
>         f.write('20120416')
>         f.close()
>         try:
> -            uploads_dir_path, target_dir_path =
> self.publisher.validate_paths(param,
> -
>      self.uploads_path,
> -
>      self.target_path)
> +            uploads_dir_path, target_dir_path =
> self.publisher.validate_paths(
> +                param, self.uploads_path, self.target_path)
>             uploads_dir_path = os.path.join(self.orig_dir,
> uploads_dir_path)
>             target_dir_path = os.path.join(self.orig_dir, target_dir_path)
> -            self.publisher.move_artifacts(param, uploads_dir_path,
> target_dir_path)
> +            self.publisher.move_artifacts(param, uploads_dir_path,
> +                                          target_dir_path)
>         finally:
>             sys.stdout = orig_stdout
>             pass
> @@ -366,23 +383,25 @@
>         stdout.seek(0)
>         self.assertIn("Moved the files from", stdout.read())
>
> -    def test_move_artifacts_android_successful_move(self):
> +    def test_move_artifacts_android_successful_move2(self):
>         orig_stdout = sys.stdout
>         stdout = sys.stdout = StringIO()
>         self.publisher = SnapshotsPublisher()
> -        param = self.parser.parse_args(['-t', 'android', '-j',
> 'dummy_job_name',
> -                                        '-n', '1'])
> +        param = self.parser.parse_args(
> +            ['-t', 'android', '-j', 'dummy_job_name', '-n', '1'])
>         self.publisher.validate_args(param)
> -        build_dir = '/'.join([param.job_type, param.job_name,
> str(param.build_num)])
> +        build_dir = '/'.join(
> +            [param.job_type, param.job_name, str(param.build_num)])
>         build_path = os.path.join(self.uploads_path, build_dir)
>         os.makedirs(build_path)
>         tempfile.mkstemp(dir=build_path)
>         try:
> -            uploads_dir_path, target_dir_path =
> self.publisher.validate_paths(param,
> -                                                self.uploads_path,
> self.target_path)
> +            uploads_dir_path, target_dir_path =
> self.publisher.validate_paths(
> +                param, self.uploads_path, self.target_path)
>             uploads_dir_path = os.path.join(self.orig_dir,
> uploads_dir_path)
>             target_dir_path = os.path.join(self.orig_dir, target_dir_path)
> -            self.publisher.move_artifacts(param, uploads_dir_path,
> target_dir_path)
> +            self.publisher.move_artifacts(param, uploads_dir_path,
> +                                          target_dir_path)
>         finally:
>             sys.stdout = orig_stdout
>             pass
> @@ -394,52 +413,57 @@
>         orig_stdout = sys.stdout
>         stdout = sys.stdout = StringIO()
>         self.publisher = SnapshotsPublisher()
> -        param = self.parser.parse_args(['-t', 'android', '-j',
> 'dummy_job_name',
> -                                       '-n', '1'])
> +        param = self.parser.parse_args(
> +            ['-t', 'android', '-j', 'dummy_job_name', '-n', '1'])
>         self.publisher.validate_args(param)
> -        build_dir = '/'.join([param.job_type, param.job_name,
> str(param.build_num)])
> +        build_dir = '/'.join(
> +            [param.job_type, param.job_name, str(param.build_num)])
>         build_path = os.path.join(self.uploads_path, build_dir)
>         os.makedirs(build_path)
>         tempfile.mkstemp(dir=build_path)
>         try:
> -            uploads_dir_path, target_dir_path =
> self.publisher.validate_paths(param,
> -                                                self.uploads_path,
> self.target_path)
> +            uploads_dir_path, target_dir_path =
> self.publisher.validate_paths(
> +                param, self.uploads_path, self.target_path)
>             uploads_dir_path = os.path.join(self.orig_dir,
> uploads_dir_path)
>             target_dir_path = os.path.join(self.orig_dir, target_dir_path)
> -            self.publisher.move_artifacts(param, uploads_dir_path,
> target_dir_path)
> +            self.publisher.move_artifacts(param, uploads_dir_path,
> +                                          target_dir_path)
>         finally:
>             sys.stdout = orig_stdout
>             pass
>
>         stdout.seek(0)
> -        msg = "The latest build is now linked to  " +  target_dir_path
> +        msg = "The latest build is now linked to  " + target_dir_path
>         self.assertIn(msg, stdout.read())
>
>     def test_create_manifest_file_option(self):
>         orig_stdout = sys.stdout
>         stdout = sys.stdout = StringIO()
>         self.publisher = SnapshotsPublisher()
> -        param = self.parser.parse_args(['-t', 'android', '-j',
> 'dummy_job_name',
> -                                        '-n', '1', '-m'])
> +        param = self.parser.parse_args(
> +            ['-t', 'android', '-j', 'dummy_job_name', '-n', '1', '-m'])
>         self.publisher.validate_args(param)
> -        build_dir = '/'.join([param.job_type, param.job_name,
> str(param.build_num)])
> +        build_dir = '/'.join(
> +            [param.job_type, param.job_name, str(param.build_num)])
>         build_path = os.path.join(self.uploads_path, build_dir)
>         os.makedirs(build_path)
>         tempfile.mkstemp(dir=build_path)
>         lines = []
>         try:
> -            uploads_dir_path, target_dir_path =
> self.publisher.validate_paths(param,
> -                                                self.uploads_path,
> self.target_path)
> +            uploads_dir_path, target_dir_path =
> self.publisher.validate_paths(
> +                param, self.uploads_path, self.target_path)
>             uploads_dir_path = os.path.join(self.orig_dir,
> uploads_dir_path)
>             target_dir_path = os.path.join(self.orig_dir, target_dir_path)
>             os.chdir(uploads_dir_path)
>             for path, subdirs, files in os.walk("."):
>                 for name in files:
> -                    lines.append(os.path.join(path, name).split("./")[1]
> + "\n")
> +                    lines.append(
> +                        os.path.join(path, name).split("./")[1] + "\n")
>             os.chdir(self.orig_dir)
> -            self.publisher.move_artifacts(param, uploads_dir_path,
> target_dir_path)
> +            self.publisher.move_artifacts(param, uploads_dir_path,
> +                                          target_dir_path)
>
> -            manifest_file=os.path.join(target_dir_path, "MANIFEST")
> +            manifest_file = os.path.join(target_dir_path, "MANIFEST")
>             dest = open(manifest_file, "r").read()
>
>             if len(lines) != 0:
> @@ -449,8 +473,8 @@
>                     fd.write(line)
>                 fd.close()
>                 orig = open(tempfiles[1], "r").read()
> -
> -        except Exception, details:
> +
> +        except:
>             pass
>
>         finally:
>
>
>

-- 
Thanks and Regards,
Deepti

Revision history for this message

Данило Шеган (danilo) wrote on 2012-05-18:

#

Deepti, what Python version is on natty (I assume 2.6)?

As for indentation, I believe this reads much better, since the lines tend to be long.

Revision history for this message

Georgy Redkozubov (gesha) wrote on 2012-05-18:

#

> I am not able to run the tests successfully and it fails with the following
> error:
>
> AttributeError: 'module' object has no attribute 'test_php_unit'
>
> This is same with the latest linaro-license-protection as well.
> Also, I tried the testplan testing instructions given in the README, but it
> fails with the same error.
>
> PS: I tested this on Natty, so might be specific to my case.

It works on Precise, all tests passed.

Revision history for this message

Deepti B. Kalakeri (deeptik) wrote on 2012-05-18:

#

On Fri, May 18, 2012 at 1:25 PM, Данило Шеган <email address hidden> wrote:

> Deepti, what Python version is on natty (I assume 2.6)?
>

No its python 2.7. Are we suppose to verify this only on precise or the
test needs to be backward compatible as well ?

>
> As for indentation, I believe this reads much better, since the lines tend
> to be long.
>

ok, if you say so, everything else looks ok. +1

> --
>
> https://code.launchpad.net/~danilo/linaro-license-protection/cleanups/+merge/106249<https://code.launchpad.net/%7Edanilo/linaro-license-protection/cleanups/+merge/106249>
> Your team Linaro Infrastructure is requested to review the proposed merge
> of lp:~danilo/linaro-license-protection/cleanups into
> lp:linaro-license-protection.
>

--
Thanks and Regards,
Deepti

Revision history for this message

Stevan Radaković (stevanr) wrote on 2012-05-18:

#

On 05/18/2012 09:56 AM, Georgy Redkozubov wrote:
>> I am not able to run the tests successfully and it fails with the following
>> error:
>>
>> AttributeError: 'module' object has no attribute 'test_php_unit'
>>
>> This is same with the latest linaro-license-protection as well.
>> Also, I tried the testplan testing instructions given in the README, but it
>> fails with the same error.
>>
>> PS: I tested this on Natty, so might be specific to my case.
> It works on Precise, all tests passed.

What gesha said. I run precise as well.

Revision history for this message

Данило Шеган (danilo) wrote on 2012-05-18:

#

I've tried it on Lucid as well (with Python 2.6), and there are a few problems:
- more dependencies are needed (will update the README)
- testtools and testrepository that come with it are too old
- unittest requires modules to be imported in tests/__init__.py, which is not required with the version coming with Python 2.7.

Since we are not using distribution-provided versions of testtools and testrepository anyway, I'll build the latest versions for Lucid and try it out. If that is not sufficient, I'll claim we require Python 2.7 :)

Revision history for this message

Данило Шеган (danilo) wrote on 2012-05-18:

#

Deepti, for indentation, see the http://www.python.org/dev/peps/pep-0008/#indentation (both are acceptable according to PEP-8).

More recent testtools and testrepository depend on Python 2.7, so I'll up that dependency in our docs as well.

lp://qastaging/~danilo/linaro-license-protection/cleanups updated on 2012-05-18

82. By Данило Шеган on 2012-05-18: Update the dependencies to require Python 2.7.

Revision history for this message

Deepti B. Kalakeri (deeptik) wrote on 2012-05-18:

#

On Fri, May 18, 2012 at 1:58 PM, Данило Шеган <email address hidden> wrote:

> Deepti, for indentation, see the
> http://www.python.org/dev/peps/pep-0008/#indentation (both are acceptable
> according to PEP-8).
>
> More recent testtools and testrepository depend on Python 2.7, so I'll up
> that dependency in our docs as well.
>

Sounds good.

> --
>
> https://code.launchpad.net/~danilo/linaro-license-protection/cleanups/+merge/106249<https://code.launchpad.net/%7Edanilo/linaro-license-protection/cleanups/+merge/106249>
> Your team Linaro Infrastructure is requested to review the proposed merge
> of lp:~danilo/linaro-license-protection/cleanups into
> lp:linaro-license-protection.
>

--
Thanks and Regards,
Deepti

Revision history for this message

Deepti B. Kalakeri (deeptik) wrote on 2012-05-18:

#

+1 Approved.

Thanks!!!
Deepti

review: Approve

linaro-license-protection

Merge lp://qastaging/~danilo/linaro-license-protection/cleanups into lp://qastaging/~linaro-automation/linaro-license-protection/trunk

Commit message

Description of the change

Preview Diff

Subscribers