Landscape Client

Merge lp:~danilo/landscape-client/drop-xvfb-run into lp:~landscape/landscape-client/trunk

  1. drop-xvfb-run
  2. Merge into trunk
Proposed by Данило Шеган
Status: Merged
Approved by: Данило Шеган
Approved revision: 940
Merged at revision: 940
Proposed branch: lp:~danilo/landscape-client/drop-xvfb-run
Merge into: lp:~landscape/landscape-client/trunk
Diff against target: 16 lines (+1/-5)
1 file modified
Makefile (+1/-5)
To merge this branch: bzr merge lp:~danilo/landscape-client/drop-xvfb-run
Reviewer Review Type Date Requested Status
Eric Snow (community) Approve
🤖 Landscape Builder test results Approve
Free Ekanayaka (community) Approve
Review via email: mp+319400@code.launchpad.net

Commit message

Drop xvfb-run from 'make check'

xvfb was probably used for our former GUI code, but now seems unnecessary.

I sneak in a LC_ALL=C there to make landscape.lib.tests.test_network.NetworkInfoTest.test_get_active_device_info pass if you've got Serbian local set up too.

Description of the change

Drop xvfb-run from 'make check'

xvfb was probably used for our former GUI code, but now seems unnecessary.

(I sneak in a LC_ALL=C there to make landscape.lib.tests.test_network.NetworkInfoTest.test_get_active_device_info pass if you've got Serbian local set up too)

Testing instructions:

"make check".

To post a comment you must log in.
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 939
Branch: lp:~danilo/landscape-client/drop-xvfb-run
Jenkins: https://ci.lscape.net/job/latch-test-precise/894/

review: Approve (test results)
lp:~danilo/landscape-client/drop-xvfb-run updated
940. By Данило Шеган

Also prepend test command with LC_ALL=C so it works for Danilo too.

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 940
Branch: lp:~danilo/landscape-client/drop-xvfb-run
Jenkins: https://ci.lscape.net/job/latch-test-precise/895/

review: Approve (test results)
Revision history for this message
Free Ekanayaka (free.ekanayaka) wrote :

+1

review: Approve
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 940
Branch: lp:~danilo/landscape-client/drop-xvfb-run
Jenkins: https://ci.lscape.net/job/latch-test-xenial/1455/

review: Approve (test results)
Revision history for this message
Eric Snow (ericsnowcurrently) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2017-01-05 11:19:41 +0000
3+++ Makefile 2017-03-09 09:20:57 +0000
4@@ -23,11 +23,7 @@
5 $(PYTHON) setup.py build_ext -i
6
7 check: build
8- if [ -z "$$DISPLAY" ]; then \
9- xvfb-run $(TEST_COMMAND); \
10- else \
11- $(TEST_COMMAND); \
12- fi
13+ LC_ALL=C $(TEST_COMMAND)
14
15 lint:
16 bzr ls-lint

Subscribers

People subscribed via source and target branches

to all changes: