Skip to content

remote/client: various fixes #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jluebbe merged 2 commits into from
Mar 15, 2017
Merged

remote/client: various fixes #25

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a0860a
remote/client: replace assert with explicit checks for user and host
Emantor Mar 14, 2017
9caee37
remote/client: if we have an exact match for a place, return it
Emantor Mar 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion labgrid/remote/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,8 @@ def get_place(self, place=None):
places = self._match_places(pattern)
if not places:
raise UserError("place pattern {} matches nothing".format(pattern))
if pattern in places:
return self.places[pattern]
if len(places) > 1:
raise UserError(
"pattern {} matches multiple places ({})".
Expand Down Expand Up @@ -408,7 +410,13 @@ def release(self):
print("released place {}".format(place.name))

def get_target_config(self, place):
assert place.acquired
if not place.acquired:
raise UserError("place {} is not acquired".format(place.name))
host, user = place.acquired.split('/')
if user != getuser():
raise UserError("place {} is not acquired by your user, acquired by {}".format(place.name, user))
if host != gethostname():
raise UserError("place {} is not acquired on this computer, acquired on {}".format(place.name, host))
config = {}
resources = config['resources'] = {}
for (
Expand Down