Merge into trunk : fix-1328600 : Code : Autopilot

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-09-09
Robert Bruce Park (community)			Approve on 2014-09-08
Christopher Lee (community)			Needs Fixing on 2014-09-08
Thomi Richards (community)		2014-07-18	Approve on 2014-07-22
Barry Warsaw		2014-07-22	Pending
Review via email: mp+227399@code.launchpad.net

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-18:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/804/rebuild

review: Approve (continuous-integration)

Revision history for this message

Thomi Richards (thomir-deactivatedaccount) wrote on 2014-07-21:

#

This doesn't actually fix the problem, it just creates new problems. Please see my comment on the bug report:

https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1328600/comments/9

Thanks for the patch though, but it looks like this is going to be a bit more of an involved fix.

Cheers,

review: Disapprove

Revision history for this message

Nicholas Skaggs (nskaggs) wrote on 2014-07-22:

#

So the idea of using tzlocal seems to suffer from daylight savings problem, unless I'm missing something.

>>> from datetime import datetime, time, timedelta
>>> from dateutil.tz import tzlocal, tzutc
>>> print(datetime.fromtimestamp(1377209927))
2013-08-22 18:18:47
>>> print(datetime.fromtimestamp(1377209927,tzutc()))
2013-08-22 22:18:47+00:00
>>> naive = datetime.fromtimestamp(0) + timedelta(seconds=1377209927)
>>> print(naive)
2013-08-22 17:18:47
>>> aware = naive.replace(tzinfo=tzlocal())
>>> print(aware)
2013-08-22 17:18:47-04:00
>>> print(aware.astimezone(tzutc()))
2013-08-22 21:18:47+00:00
>>> aware2 = datetime.fromtimestamp(0, tzlocal())
>>> print(aware2)
1969-12-31 19:00:00-05:00
>>> print(aware2.astimezone(tzutc()))
1970-01-01 00:00:00+00:00
>>> try2 = aware2 + timedelta(seconds=1377209927)
>>> print(try2)
2013-08-22 17:18:47-04:00
>>> print(try2.astimezone(tzutc()))
2013-08-22 21:18:47+00:00

Revision history for this message

Nicholas Skaggs (nskaggs) wrote on 2014-07-22:

#

Going to grab the local offset at the time of the timestamp and apply it against the fromtimestamp date.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-22:

#

FAILED: Continuous integration, rev:511
http://jenkins.qa.ubuntu.com/job/autopilot-ci/815/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/90/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/89/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/89/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/231/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2154/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/815/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-22:

#

FAILED: Continuous integration, rev:512
http://jenkins.qa.ubuntu.com/job/autopilot-ci/817/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/92/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/91/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/91/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/233/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2156/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/817/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-22:

#

FAILED: Continuous integration, rev:513
http://jenkins.qa.ubuntu.com/job/autopilot-ci/819/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/94
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/94/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/93/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/93/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/235/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/289/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2160
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2160/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/819/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-22:

#

FAILED: Continuous integration, rev:512
http://jenkins.qa.ubuntu.com/job/autopilot-ci/818/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/93/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/92/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/92/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/234/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2158/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/818/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Thomi Richards (thomir-deactivatedaccount) wrote on 2014-07-22:

#

I have a couple of comments in the diff.

Overall, this looks excellent - thank you for taking this on.

There's one change I'd like you to make in the tests, and I'd really like Barry Warsaw to review the implementation.

I'm setting this to approve, so you don't need a re-review once those two things have happeend (I trust ya :D )

review: Approve

Revision history for this message

Thomi Richards (thomir-deactivatedaccount) wrote on 2014-07-22:

#

Oh, also, CI has to pass (obviously)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-22:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/823/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-22:

#

FAILED: Continuous integration, rev:513
http://jenkins.qa.ubuntu.com/job/autopilot-ci/821/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/96
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/96/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/95/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/95/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/237/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/291/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2163
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2163/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/821/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-22:

#

FAILED: Continuous integration, rev:513
http://jenkins.qa.ubuntu.com/job/autopilot-ci/822/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/97
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/97/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/96/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/96/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/238/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/292/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2165
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2165/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/822/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-22:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/824/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Nicholas Skaggs (nskaggs) wrote on 2014-07-22:

#

Tests don't want to run now?

/var/local/autopilot/setup.log: I: Running autopilot
/var/local/autopilot/setup.log: I: Using python2
tail: '/var/lib/lxc//utopic-amd64-20140619-0752/run/delta//var/local/autopilot/autopilot.log' has become accessible
/var/local/autopilot/autopilot.log: Loading tests from: /usr/lib/python2.7/dist-packages
/var/local/autopilot/autopilot.log:
/var/local/autopilot/autopilot.log: Did not find any tests
/var/local/autopilot/autopilot.log:
/var/local/autopilot/autopilot.log: ----------------------------------------------------------------------
/var/local/autopilot/autopilot.log: Ran 0 tests in 0.126s
/var/local/autopilot/autopilot.log:
/var/local/autopilot/autopilot.log: OK
/var/local/autopilot/setup.log: I: Using python3
tail: /var/lib/lxc//utopic-amd64-20140619-0752/run/delta//var/local/autopilot/autopilot.log: file truncated
/var/local/autopilot/autopilot.log:
/var/local/autopilot/autopilot.log: ----------------------------------------------------------------------
/var/local/autopilot/autopilot.log: Ran 0 tests in 0.110s
/var/local/autopilot/autopilot.log:
/var/local/autopilot/autopilot.log: OK
/var/local/autopilot/setup.log: I: No test left to run

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-23:

#

FAILED: Continuous integration, rev:514
http://jenkins.qa.ubuntu.com/job/autopilot-ci/826/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/101/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/100/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/100/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/243/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2173/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/826/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-01:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/839/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-13:

#

FAILED: Continuous integration, rev:515
http://jenkins.qa.ubuntu.com/job/autopilot-ci/842/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/117/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/116/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/116/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/278/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3039/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/842/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-13:

#

FAILED: Continuous integration, rev:509
http://jenkins.qa.ubuntu.com/job/autopilot-ci/843/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/118/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/117/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/117/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/279/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3040/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/843/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-14:

#

FAILED: Continuous integration, rev:516
http://jenkins.qa.ubuntu.com/job/autopilot-ci/844/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/119/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/118/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/118/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/280/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3071/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/844/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-14:

#

FAILED: Continuous integration, rev:522
http://jenkins.qa.ubuntu.com/job/autopilot-ci/845/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/120/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/119/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/119/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/281/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3092/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/845/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-14:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/846/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-15:

#

FAILED: Continuous integration, rev:524
http://jenkins.qa.ubuntu.com/job/autopilot-ci/847/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/122/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/121/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/121/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/283/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3096/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/847/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-15:

#

FAILED: Continuous integration, rev:525
http://jenkins.qa.ubuntu.com/job/autopilot-ci/848/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/123/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/122/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/122/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/284/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3097/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/848/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-28:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/851/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-28:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/852/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-28:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/853/rebuild

review: Needs Fixing (continuous-integration)

lp:~nskaggs/autopilot/fix-1328600 updated on 2014-08-29

530. By Nicholas Skaggs on 2014-08-29: merge trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-29:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/854/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Nicholas Skaggs (nskaggs) wrote on 2014-08-29:

#

Why is this running 0 tests?

lp:~nskaggs/autopilot/fix-1328600 updated on 2014-08-29

531. By Nicholas Skaggs on 2014-08-29: swap TestWithScenarios around

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-29:

#

FAILED: Continuous integration, rev:531
http://jenkins.qa.ubuntu.com/job/autopilot-ci/855/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/130/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/129/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/129/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/292/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3508/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/855/rebuild

review: Needs Fixing (continuous-integration)

lp:~nskaggs/autopilot/fix-1328600 updated on 2014-08-29

532. By Nicholas Skaggs on 2014-08-29: undo swap

Revision history for this message

Nicholas Skaggs (nskaggs) wrote on 2014-08-29:

#

I see a crash:

PythonArgs: ['/usr/sbin/aa-status']
Traceback:
Traceback (most recent call last):
   File "/usr/sbin/aa-status", line 194, in <module>
     commands[cmd]()
   File "/usr/sbin/aa-status", line 17, in cmd_enabled
     if get_profiles() == {}:
   File "/usr/sbin/aa-status", line 92, in get_profiles
     for p in open(apparmor_profiles).readlines():
PermissionError: [Errno 13] Permission denied: '/sys/kernel/security/apparmor/profiles'

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-29:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/856/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-02:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/857/rebuild

review: Needs Fixing (continuous-integration)

lp:~nskaggs/autopilot/fix-1328600 updated on 2014-09-04

533. By Nicholas Skaggs on 2014-09-04: add depends to tests as well

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-04:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/859/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-04:

#

FAILED: Continuous integration, rev:533
http://jenkins.qa.ubuntu.com/job/autopilot-ci/860/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/135/console
    None: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/134/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/297/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/860/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Nicholas Skaggs (nskaggs) wrote on 2014-09-04:

#

Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/autopilot/tests/functional/test_types.py", line 28, in test_date
    datetime(2014, 1, 1, 0, 0, 0)
  File "/usr/lib/python3/dist-packages/testtools/testcase.py", line 338, in assertEqual
    self.assertThat(observed, matcher, message)
  File "/usr/lib/python3/dist-packages/testtools/testcase.py", line 423, in assertThat
    raise mismatch_error
testtools.matchers._impl.MismatchError: DateTime(2014-01-01 00:00:00) != datetime.datetime(2014, 1, 1, 0, 0)

lp:~nskaggs/autopilot/fix-1328600 updated on 2014-09-04

534. By Nicholas Skaggs on 2014-09-04: tweak functional test

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-04:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/861/rebuild

review: Needs Fixing (continuous-integration)

lp:~nskaggs/autopilot/fix-1328600 updated on 2014-09-08

535. By Nicholas Skaggs on 2014-09-08: add tzlocal to datetime functional test
536. By Nicholas Skaggs on 2014-09-08: wrap and sort packaging tweaks

Revision history for this message

Christopher Lee (veebers) wrote on 2014-09-08:

#

A couple of minor indent issues. Deeper review to come.

review: Needs Fixing

Revision history for this message

Robert Bruce Park (robru) wrote on 2014-09-08:

#

Packaging looks good, thanks for the wrap-and-sort, makes for a noisy diff now but easier to read later.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-08:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/865/rebuild

review: Approve (continuous-integration)

lp:~nskaggs/autopilot/fix-1328600 updated on 2014-09-08

537. By Nicholas Skaggs on 2014-09-08: fix layout, properly construct object for functional test

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-09:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/866/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-09:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/867/rebuild

review: Approve (continuous-integration)

Revision history for this message

Nicholas Skaggs (nskaggs) wrote on 2014-09-18:

#

Can you provide an update on what you'd like to see with mp?

Autopilot

Merge lp:~nskaggs/autopilot/fix-1328600 into lp:autopilot

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers

 === modified file 'autopilot/introspection/types.py'
 --- autopilot/introspection/types.py	2014-05-29 19:44:44 +0000
 +++ autopilot/introspection/types.py	2014-09-08 23:54:02 +0000
@@ -37,7 +37,8 @@
  """
--from datetime import datetime, time
++from datetime import datetime, time, timedelta
++from dateutil.tz import tzlocal
  import dbus
  import logging
  from testtools.matchers import Equals
@@ -547,6 +548,8 @@
      """The DateTime class represents a date and time in the UTC timezone.
      DateTime is constructed by passing a unix timestamp in to the constructor.
++    The incoming timestamp is assumed to be in localtime.
++    For date support for 32-bit platforms beyond 2038, we use a timedelta.
      Timestamps are expressed as the number of seconds since 1970-01-01T00:00:00
      in the UTC timezone::
@@ -573,6 +576,9 @@
          >>> my_dt.second
++        >>> my_dt.tzinfo
++        UTC
++
      Two DateTime objects can be compared for equality::
@@ -599,7 +605,8 @@
      """
      def __init__(self, *args, **kwargs):
          super(DateTime, self).__init__(*args, **kwargs)
--        self._cached_dt = datetime.fromtimestamp(self[0])
++        self._cached_dt = datetime.fromtimestamp(
++            0, tz=tzlocal()) + timedelta(seconds=self[0])
      @property
      def year(self):
@@ -627,7 +634,11 @@
      @property
      def timestamp(self):
--        return self[0]
++        return self._cached_dt.timestamp
++
++    @property
++    def tzinfo(self):
++        return self._cached_dt.tzinfo
      @property
      def datetime(self):
 === modified file 'autopilot/tests/functional/test_types.py'
 --- autopilot/tests/functional/test_types.py	2014-05-22 06:41:16 +0000
 +++ autopilot/tests/functional/test_types.py	2014-09-08 23:54:02 +0000
@@ -1,8 +1,10 @@
--from datetime import datetime
++from datetime import datetime, timedelta
++import time
  from autopilot.testcase import AutopilotTestCase
  from autopilot.tests.functional import QmlScriptRunnerMixin
++from dateutil.tz import tzlocal
  from textwrap import dedent
@@ -23,7 +25,11 @@
+             )
+         )
          item = proxy.select_single('*', objectName="TestMePlease")
++        dt = datetime(2014, 1, 1, 0, 0, 0, tzinfo=tzlocal())
++        timestamp = time.mktime(dt.timetuple())
++        dt = datetime.fromtimestamp(
++            0, tz=tzlocal()) + timedelta(seconds=timestamp)
          self.assertEqual(
              item.foo,
--            datetime(2014, 1, 1, 0, 0, 0)
++            dt
+         )
 === modified file 'autopilot/tests/unit/test_types.py'
 --- autopilot/tests/unit/test_types.py	2014-07-22 02:39:26 +0000
 +++ autopilot/tests/unit/test_types.py	2014-09-08 23:54:02 +0000
@@ -17,8 +17,9 @@
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #
--from datetime import datetime, time
--from testscenarios import TestWithScenarios
++from datetime import datetime, time, timedelta
++import pytz
++from testscenarios import TestWithScenarios, multiply_scenarios
  from testtools import TestCase
  from testtools.matchers import Equals, IsInstance, NotEquals, raises
@@ -281,79 +282,153 @@
          self.assertEqual(repr(c), str(c))
--class DateTimeTests(TestCase):
++class DateTimeTests(TestWithScenarios, TestCase):
++
++    timestamps = [
++        ('32bitlimit',
++            {'timestamp': 2983579200
++             }),
++
++        ('winter',
++            {'timestamp': 1389744000
++             }),
++
++        ('summer',
++            {'timestamp': 1405382400
++             })
++    ]
++
++    timezones = [
++        ('UTC',
++            {'timezone': 'UTC'
++             }),
++
++        ('NewZealand',
++            {'timezone': 'NZ',
++             }),
++
++        ('Pacific',
++            {'timezone': 'US/Pacific'
++             }),
++
++        ('Hongkong',
++            {'timezone': 'Hongkong'
++             }),
++
++        ('MSK',
++            {'timezone': 'Europe/Moscow'
++             })
++    ]
++
++    scenarios = multiply_scenarios(timestamps, timezones)
++
++    def local_timezone(self):
++        tz = pytz.timezone(self.timezone)
++        return tz
++
++    def local_from_timestamp(self, timestamp):
++        # fromtimestamp is naive
++        # thus we need create a "local" timestamp for test comparision
++        # and support 32-bit limit via timedelta
++        return datetime.fromtimestamp(
++            0, tz=self.local_timezone()) + timedelta(seconds=timestamp)
      def test_can_construct_datetime(self):
--        dt = DateTime(1377209927)
--        self.assertThat(dt, IsInstance(dbus.Array))
++        with patch('autopilot.introspection.types.tzlocal',
++                   new=self.local_timezone):
++            dt = DateTime(self.timestamp)
++            self.assertThat(dt, IsInstance(dbus.Array))
      def test_datetime_has_slice_access(self):
--        dt = DateTime(1377209927)
++        with patch('autopilot.introspection.types.tzlocal',
++                   new=self.local_timezone):
++            dt = DateTime(self.timestamp)
--        self.assertThat(dt[0], Equals(1377209927))
++            self.assertThat(dt[0], Equals(self.timestamp))
      def test_datetime_has_properties(self):
--        dt = DateTime(1377209927)
++        with patch('autopilot.introspection.types.tzlocal',
++                   new=self.local_timezone):
++            dt = DateTime(self.timestamp)
--        self.assertTrue(hasattr(dt, 'timestamp'))
--        self.assertTrue(hasattr(dt, 'year'))
--        self.assertTrue(hasattr(dt, 'month'))
--        self.assertTrue(hasattr(dt, 'day'))
--        self.assertTrue(hasattr(dt, 'hour'))
--        self.assertTrue(hasattr(dt, 'minute'))
--        self.assertTrue(hasattr(dt, 'second'))
++            self.assertTrue(hasattr(dt, 'timestamp'))
++            self.assertTrue(hasattr(dt, 'year'))
++            self.assertTrue(hasattr(dt, 'month'))
++            self.assertTrue(hasattr(dt, 'day'))
++            self.assertTrue(hasattr(dt, 'hour'))
++            self.assertTrue(hasattr(dt, 'minute'))
++            self.assertTrue(hasattr(dt, 'second'))
++            self.assertTrue(hasattr(dt, 'tzinfo'))
      def test_datetime_properties_have_correct_values(self):
--        dt = DateTime(1377209927)
--        dt_with_tz = datetime.fromtimestamp(1377209927)
++        with patch('autopilot.introspection.types.tzlocal',
++                   new=self.local_timezone):
++            dt1 = DateTime(self.timestamp)
++            dt2 = self.local_from_timestamp(self.timestamp)
--        self.assertThat(dt.timestamp, Equals(dt_with_tz.timestamp()))
--        self.assertThat(dt.year, Equals(dt_with_tz.year))
--        self.assertThat(dt.month, Equals(dt_with_tz.month))
--        self.assertThat(dt.day, Equals(dt_with_tz.day))
--        self.assertThat(dt.hour, Equals(dt_with_tz.hour))
--        self.assertThat(dt.minute, Equals(dt_with_tz.minute))
--        self.assertThat(dt.second, Equals(dt_with_tz.second))
++            self.assertThat(dt1.year, Equals(dt2.year))
++            self.assertThat(dt1.month, Equals(dt2.month))
++            self.assertThat(dt1.day, Equals(dt2.day))
++            self.assertThat(dt1.hour, Equals(dt2.hour))
++            self.assertThat(dt1.minute, Equals(dt2.minute))
++            self.assertThat(dt1.second, Equals(dt2.second))
++            self.assertThat(dt1.tzinfo, Equals(dt2.tzinfo))
++            self.assertThat(dt1.timestamp(), Equals(dt2.timestamp()))
++            self.assertThat(dt1.timestamp(), Equals(self.timestamp))
      def test_equality_with_datetime(self):
--        dt1 = DateTime(1377209927)
--        dt2 = DateTime(1377209927)
++        with patch('autopilot.introspection.types.tzlocal',
++                   new=self.local_timezone):
++            dt1 = DateTime(self.timestamp)
++            dt2 = datetime(dt1.year, dt1.month, dt1.day,
++                           dt1.hour, dt1.minute, dt1.second,
++                           tzinfo=dt1.tzinfo)
--        self.assertThat(dt1, Equals(dt2))
++            self.assertThat(dt1, Equals(dt2))
      def test_equality_with_list(self):
--        dt1 = DateTime(1377209927)
--        dt2 = [1377209927]
++        with patch('autopilot.introspection.types.tzlocal',
++                   new=self.local_timezone):
++            dt1 = DateTime(self.timestamp)
++            dt2 = [self.timestamp]
--        self.assertThat(dt1, Equals(dt2))
++            self.assertThat(dt1, Equals(dt2))
      def test_equality_with_datetime_timestamp(self):
--        # DateTime no longer assumes UTC and uses local TZ.
--        dt1 = DateTime(1377209927)
--        dt2 = datetime.fromtimestamp(1377209927)
--        dt3 = datetime.fromtimestamp(1377209928)
++        with patch('autopilot.introspection.types.tzlocal',
++                   new=self.local_timezone):
++            dt1 = DateTime(self.timestamp)
++            dt2 = self.local_from_timestamp(self.timestamp)
++            dt3 = self.local_from_timestamp(self.timestamp + 1)
--        self.assertThat(dt1, Equals(dt2))
--        self.assertThat(dt1, NotEquals(dt3))
++            self.assertThat(dt1, Equals(dt2))
++            self.assertThat(dt1, NotEquals(dt3))
      def test_can_convert_to_datetime(self):
--        dt1 = DateTime(1377209927)
++        with patch('autopilot.introspection.types.tzlocal',
++                   new=self.local_timezone):
++            dt1 = DateTime(self.timestamp)
--        self.assertThat(dt1.datetime, IsInstance(datetime))
++            self.assertThat(dt1.datetime, IsInstance(datetime))
      def test_repr(self):
--        expected = repr_type(
--            u"DateTime({:%Y-%m-%d %H:%M:%S})".format(
--                datetime.fromtimestamp(1377209927)
++        with patch('autopilot.introspection.types.tzlocal',
++                   new=self.local_timezone):
++            dt = DateTime(self.timestamp)
++            observed = repr(dt)
++            expected = repr_type(
++                u"DateTime({:%Y-%m-%d %H:%M:%S})".format(
++                    self.local_from_timestamp(
++                        self.timestamp).replace(tzinfo=self.local_timezone())
++                )
+             )
--        )
--        dt = DateTime(1377209927)
--        observed = repr(dt)
--        self.assertEqual(expected, observed)
++            self.assertEqual(expected, observed)
      def test_repr_equals_str(self):
--        dt = DateTime(1377209927)
--        self.assertEqual(repr(dt), str(dt))
++        with patch('autopilot.introspection.types.tzlocal',
++                   new=self.local_timezone):
++            dt = DateTime(self.timestamp)
++            self.assertEqual(repr(dt), str(dt))
  class TimeTests(TestCase):
 === modified file 'debian/control'
 --- debian/control	2014-08-05 21:58:41 +0000
 +++ debian/control	2014-09-08 23:54:02 +0000
@@ -15,6 +15,7 @@
                 libjs-underscore,
                 liblttng-ust-dev,
                 python3-all-dev (>= 3.4),
++               python3-dateutil,
                 python3-dbus,
                 python3-decorator,
                 python3-evdev,
@@ -22,13 +23,14 @@
                 python3-flake8,
                 python3-gi,
                 python3-junitxml,
++               python3-pil,
                 python3-psutil,
--               python3-pil,
                 python3-setuptools,
                 python3-sphinx,
                 python3-subunit,
                 python3-testscenarios,
                 python3-testtools,
++               python3-tz,
                 python3-xlib,
                 sphinx-common,
                 texlive-latex-extra,
@@ -40,33 +42,34 @@
  Package: python3-autopilot
  Architecture: all
--Depends: ${misc:Depends},
--         ${python3:Depends},
--         gir1.2-ubuntu-app-launch-2 | gir1.2-upstart-app-launch-2,
--         libjs-underscore, libjs-jquery,
++Depends: gir1.2-ubuntu-app-launch-2 | gir1.2-upstart-app-launch-2,
++         libjs-jquery,
++         libjs-underscore,
           python3-dbus,
           python3-decorator,
           python3-fixtures,
           python3-gi,
           python3-junitxml,
++         python3-pil,
           python3-psutil,
--         python3-pil,
           python3-subunit,
           python3-testscenarios,
           python3-testtools,
           udev,
--Recommends: python3-xlib,
--            python3-evdev,
--            gir1.2-gconf-2.0,
++         ${misc:Depends},
++         ${python3:Depends},
++Recommends: gir1.2-gconf-2.0,
              gir1.2-glib-2.0,
              gir1.2-gtk-3.0,
              gir1.2-ibus-1.0,
              libautopilot-gtk (>= 1.4),
              libautopilot-qt (>= 1.4),
              python3-autopilot-trace,
++            python3-evdev,
++            python3-xlib,
              recordmydesktop,
  Breaks: libautopilot-gtk (<< 1.4),
--	libautopilot-qt (<< 1.4),
++        libautopilot-qt (<< 1.4),
  Description: Utility to write and run integration tests easily (Python 3)
   The autopilot engine enables to ease the writing of python tests
   for your application manipulating your inputs like the mouse and
@@ -75,9 +78,9 @@
  Package: python3-autopilot-trace
  Architecture: any
--Depends: ${misc:Depends},
++Depends: python3-autopilot,
++         ${misc:Depends},
           ${shlibs:Depends},
--         python3-autopilot,
  Description: Support for tracing in autopilot (Python 3)
   This package contains the binary lttng trace point for tracing
   autopilot tests. This is useful when using autopilot to exercise
@@ -86,12 +89,12 @@
  Package: autopilot-touch
  Architecture: all
  Section: metapackages
--Depends: ${misc:Depends},
--         autopilot-qt5,
++Depends: autopilot-qt5,
++         fbset,
++         python3-autopilot,
++         python3-evdev,
           qttestability-autopilot,
--         python3-autopilot,
--         python3-evdev,
--         fbset,
++         ${misc:Depends},
  Description: Autopilot support for the ubuntu Touch platform
   This metapackage exists to depend on the packages needed to install and use
   autopilot on the Ubuntu Touch platform.
@@ -99,14 +102,14 @@
  Package: autopilot-desktop
  Architecture: all
  Section: metapackages
--Depends: ${misc:Depends},
--         at-spi2-core,
++Depends: at-spi2-core,
++         bamfdaemon,
           gir1.2-gconf-2.0,
           gir1.2-glib-2.0,
           gir1.2-gtk-3.0,
           python3-autopilot,
           python3-xlib,
--         bamfdaemon,
++         ${misc:Depends},
  Recommends: python3-autopilot-vis,
              python3-evdev,
  Description: Autopilot support for the ubuntu Desktop platform
@@ -115,13 +118,13 @@
  Package: python3-autopilot-vis
  Architecture: all
--Depends: ${misc:Depends},
--         ${python3:Depends},
--         gnome-icon-theme,
++Depends: gnome-icon-theme,
           python3-autopilot,
           python3-dbus,
           python3-dbus.mainloop.qt,
           python3-pyqt4,
++         ${misc:Depends},
++         ${python3:Depends},
  Recommends: python3-lxml,
  Description: visualisation application for Autopilot (Python 3)
   The Autopilot vis tool allows you to inspect an application introspection
@@ -130,17 +133,19 @@
  Package: python3-autopilot-tests
  Architecture: all
--Depends: ${misc:Depends},
--         ${python3:Depends},
--         libautopilot-gtk (>= 1.4),
++Depends: libautopilot-gtk (>= 1.4),
           libautopilot-qt (>= 1.4),
--         python3-autopilot,
--         python3-dbus.mainloop.qt,
--         python3-evdev,
--         python3-pyqt4,
           python-windowmocker,
++         python3-autopilot,
++         python3-dateutil,
++         python3-dbus.mainloop.qt,
++         python3-evdev,
++         python3-pyqt4,
++         python3-tz,
           qmlscene,
           recordmydesktop,
++         ${misc:Depends},
++         ${python3:Depends},
  Description: Tests for the autopilot functional test tool. (Python 3)
   This package contains tests for the python3-autopilot package.
   You can use this package to verify that autopilot is functioning
 === modified file 'debian/copyright'
 --- debian/copyright	2013-08-28 07:24:58 +0000
 +++ debian/copyright	2014-09-08 23:54:02 +0000
@@ -21,4 +21,3 @@
+  .
   On Debian systems, the complete text of the GNU General
   Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
--
 === modified file 'debian/python3-autopilot-tests.install'
 --- debian/python3-autopilot-tests.install	2014-04-02 01:30:40 +0000
 +++ debian/python3-autopilot-tests.install	2014-09-08 23:54:02 +0000
@@ -1,4 +1,4 @@
  usr/lib/python3*/*/autopilot/tests/*.py
++usr/lib/python3*/*/autopilot/tests/acceptance/*.py
++usr/lib/python3*/*/autopilot/tests/functional/*.py
  usr/lib/python3*/*/autopilot/tests/unit/*.py
--usr/lib/python3*/*/autopilot/tests/functional/*.py
--usr/lib/python3*/*/autopilot/tests/acceptance/*.py
 === modified file 'debian/python3-autopilot-vis.install'
 --- debian/python3-autopilot-vis.install	2014-05-05 20:37:46 +0000
 +++ debian/python3-autopilot-vis.install	2014-09-08 23:54:02 +0000
@@ -1,4 +1,4 @@
--usr/lib/python3*/*/autopilot/vis/*.py
  debian/autopilot3-vis.desktop /usr/share/applications
  icons/autopilot-toggle-overlay.svg /usr/share/icons/hicolor/scalable/actions/
  icons/autopilot.svg /usr/share/icons/hicolor/scalable/apps/
++usr/lib/python3*/*/autopilot/vis/*.py
 === modified file 'debian/python3-autopilot.install'
 --- debian/python3-autopilot.install	2014-05-15 05:59:44 +0000
 +++ debian/python3-autopilot.install	2014-09-08 23:54:02 +0000
@@ -1,3 +1,4 @@
++
  debian/61-autopilot3-uinput.rules /lib/udev/rules.d
  usr/bin/autopilot3 /usr/bin/
  usr/bin/autopilot3-sandbox-run /usr/bin/
@@ -9,4 +10,3 @@
  usr/lib/python3*/*/autopilot/introspection/*.py
  usr/lib/python3*/*/autopilot/matchers/*.py
  usr/lib/python3*/*/autopilot/process/*.py
--