/snapcraft

Snap: When snapping a directory, look for snap.yaml. #297

Merged
merged 1 commit into from Feb 5, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@kyrofa @sergiusens
@kyrofa
Member

kyrofa commented Feb 4, 2016

Fixes LP: #1541987
integration_tests/test_snap.py
+ os.chdir(project_dir)
+
+ snap_file_path = 'assemble_1.0_{}.snap'.format(_get_deb_arch())
+ self.assertThat(snap_file_path, FileExists())
@sergiusens

sergiusens Feb 4, 2016

Collaborator

maybe delete the snap here

integration_tests/test_snap.py
+ # Verify that Snapcraft can snap its own snap directory (this will make
+ # sure `snapcraft snap` and `snapcraft snap <directory>` are always in
+ # sync).
+ self.run_snapcraft(['snap', 'snap'])
@sergiusens

sergiusens Feb 4, 2016

Collaborator

and check for existence after this

@kyrofa

kyrofa Feb 4, 2016

Member

Ah, good ideas. Done.

@kyrofa
Snap: When snapping a directory, look for snap.yaml. 
Currently it's still looking for package.yaml, which is no longer
supported by Snappy.

LP: #1541987

Signed-off-by: Kyle Fazzari <kyle@canonical.com>
This commit was signed with a verified signature.
@kyrofa kyrofa Kyle Fazzari
GPG key ID: A7D23FB0E778DEDF Learn about signing commits

Some checks were not successful

1 failing and 1 successful checks
coverage/coveralls — Coverage decreased (-0.0%) to 93.212%
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
0d20d7c
@sergiusens
Collaborator

sergiusens commented Feb 5, 2016

👍

sergiusens added a commit that referenced this pull request Feb 5, 2016

@sergiusens
Merge pull request #297 from kyrofa/bugfix/1541987/snap_directory_pac… 
…kage.yaml

Snap: When snapping a directory, look for snap.yaml.
53236ee

@sergiusens sergiusens merged commit 53236ee into snapcore:master Feb 5, 2016
1 of 2 checks passed

1 of 2 checks passed

coverage/coveralls Coverage decreased (-0.0%) to 93.212%
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@kyrofa kyrofa deleted the kyrofa:bugfix/1541987/snap_directory_package.yaml branch Feb 27, 2016

smoser pushed a commit to smoser/snapcraft that referenced this pull request Sep 14, 2016

@brendandixon
Merge pull request #304 from brendandixon/movethreads 
Move monitoring threads to child process and fix #297
9209114

smoser pushed a commit to smoser/snapcraft that referenced this pull request Sep 14, 2016

@brendandixon @hglkrijger
Fix #297 and signal forwarding recursion (#317) 
Signed-off-by: Brendan Dixon <brendand@microsoft.com>
7c8f681

kalikiana pushed a commit to kalikiana/snapcraft that referenced this pull request Apr 6, 2017

@sergiusens
Merge pull request #297 from kyrofa/bugfix/1541987/snap_directory_pac… 
…kage.yaml

Snap: When snapping a directory, look for snap.yaml.
1ee2db0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment