camera-app

Merge lp:~om26er/camera-app/test-fix into lp:camera-app

test-fix
Merge into trunk

Proposed by Omer Akram on 2015-04-15

Status:

Merged

Approved by:

Florian Boucault on 2015-05-05

Approved revision:

551

Merged at revision:

556

Proposed branch:

lp:~om26er/camera-app/test-fix

Merge into:

lp:camera-app

Diff against target:

28 lines (+10/-9)

1 file modified

tests/autopilot/camera_app/tests/__init__.py (+10/-9)

To merge this branch:

bzr merge lp:~om26er/camera-app/test-fix

Undecided

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-04-30
Leo Arias (community)			Approve on 2015-04-30
Ubuntu Phablet Team		2015-04-15	Pending
Review via email: mp+256382@code.launchpad.net

Commit Message

Autopilot: Ensure the media directories exist before trying to delete data from them.

Description of the Change

Autopilot: Ensure the media directories exist before trying to delete data from them.

PS Jenkins bot (ps-jenkins) wrote on 2015-04-15:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/415/rebuild

review: Needs Fixing (continuous-integration)

Leo Arias (elopio) wrote on 2015-04-30:

Thanks Omer.
You can extract a method for the common bits of both cases.

review: Needs Fixing

lp:~om26er/camera-app/test-fix updated on 2015-04-30

550. By Omer Akram on 2015-04-30: reuse code

Omer Akram (om26er) wrote on 2015-04-30:

> Thanks Omer.
> You can extract a method for the common bits of both cases.

Done. I am not able to decide though on what should be the name of the method which checks if a directory exists or not.

I named is directory_exists() would is_directory_there() better or does_directory_exist() ? Or anything else.

lp:~om26er/camera-app/test-fix updated on 2015-04-30

551. By Omer Akram on 2015-04-30: no need to write a method to check if a directory exists, rather make direct call to os.path.exists

Leo Arias (elopio) wrote on 2015-04-30:

thank you.

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2015-04-30:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/422/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Omer Akram

Ubuntu Phablet Team

wax miguel

 === modified file 'tests/autopilot/camera_app/tests/__init__.py'
 --- tests/autopilot/camera_app/tests/__init__.py	2015-03-10 13:52:56 +0000
 +++ tests/autopilot/camera_app/tests/__init__.py	2015-04-30 17:17:06 +0000
@@ -90,15 +90,16 @@
          return MainWindow(self.app)
      def delete_all_media(self):
--        picture_files = os.listdir(self.pictures_dir)
--        for f in picture_files:
--            f = os.path.join(self.pictures_dir, f)
--            if os.path.isfile(f):
--                os.remove(f)
--
--        video_files = os.listdir(self.videos_dir)
--        for f in video_files:
--            f = os.path.join(self.videos_dir, f)
++        if os.path.exists(self.pictures_dir):
++            delete_all_files_in_directory(self.pictures_dir)
++
++        if os.path.exists(self.videos_dir):
++            delete_all_files_in_directory(self.videos_dir)
++
++    def delete_all_files_in_directory(self, directory):
++        files = os.listdir(directory)
++        for f in files:
++            f = os.path.join(directory, f)
              if os.path.isfile(f):
                  os.remove(f)