summaryrefslogtreecommitdiff
diff options
authorDaniel Manrique <roadmr@ubuntu.com>2014-08-29 13:36:05 -0400
committerDaniel Manrique <roadmr@ubuntu.com>2014-08-29 13:36:05 -0400
commit012e1e3c77f0df79df742bb06efb590e8683f373 (patch)
treefcc9e3ff8a793d3c8d643e625beb23c8647fea61
parent34d4186fdb81f780034080c1526de74d49d757e9 (diff)
Fix conflict with trunk
-rw-r--r--jobs/graphics-legacy.txt.in14
1 files changed, 7 insertions, 7 deletions
diff --git a/jobs/graphics-legacy.txt.in b/jobs/graphics-legacy.txt.in
index 795e41dd..889f28c1 100644
--- a/jobs/graphics-legacy.txt.in
+++ b/jobs/graphics-legacy.txt.in
@@ -21,7 +21,7 @@ _description:
VERIFICATION:
Did the resolution change as expected?
-plugin: user-verify
+plugin: user-interact-verify
id: graphics/resolution
requires:
device.category == 'VIDEO'
@@ -39,7 +39,7 @@ _description:
VERIFICATION:
Is this acceptable for your display?
-plugin: user-verify
+plugin: user-interact-verify
id: graphics/screen-resolution
requires:
device.category == 'VIDEO'
@@ -68,7 +68,7 @@ _description:
.
https://help.ubuntu.com/community/Installation/SystemRequirements
-plugin: user-verify
+plugin: user-interact-verify
id: graphics/maximum_resolution
requires:
device.category == 'VIDEO'
@@ -111,7 +111,7 @@ command: graphic_memory_info
_description: Collect info on graphic memory.
_summary: Collect info on graphic memory.
-plugin: user-verify
+plugin: user-interact-verify
id: graphics/cycle_resolution
requires: package.name == 'xorg'
depends: graphics/VESA_drivers_not_in_use
@@ -126,7 +126,7 @@ _description:
VERIFICATION:
Did the screen appear to be working for each mode?
-plugin: user-verify
+plugin: user-interact-verify
id: graphics/rotation
depends: graphics/xorg-version
command: rotation_test
@@ -157,12 +157,12 @@ estimated_duration: 0.131
_description: Check that hardware is able to run Unity 3D
_summary: Test Unity 3D support
-plugin: user-verify
+plugin: user-interact-verify
id: graphics/glxgears
requires: package.name == 'mesa-utils'
command: glxgears; true
-_description:
_summary: Test that glxgears works
+_description:
PURPOSE:
This test tests the basic 3D capabilities of your video card
STEPS: