Add assert_screen_change #689
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
okurz
force-pushed
the
feature/assert_screen_change
branch
from
15e1f7f
to
c082982
Compare
|
I think this CODEREF is a bit too perl specific. I suggest to add an example for perl beginners |
|
this comes from |
|
Linking will do, yes. |
okurz
force-pushed
the
feature/assert_screen_change
branch
from
c082982
to
bae1ebe
Compare
|
updated |
coolo
reviewed
Jan 12, 2017
| @@ -396,6 +397,24 @@ sub wait_screen_change(&@) { | |||
| return 0; | |||
| } | |||
|
|
|||
| =head2 assert_screen_change | |||
|
|
|||
| assert_screen_change { CODEREF [,$timeout] }; | |||
There was a problem hiding this comment.
This is actual incorrect syntax because the CODEREF is the {} - and the optinal timeout is after it. The same error is in the wait_screen_change reference
There was a problem hiding this comment.
Is this better?
diff --git a/testapi.pm b/testapi.pm
index 25a4157..165a8aa 100755
--- a/testapi.pm
+++ b/testapi.pm
@@ -354,7 +354,7 @@ sub assert_and_dclick {
=head2 wait_screen_change
- wait_screen_change { CODEREF [,$timeout] };
+ wait_screen_change(CODEREF [,$timeout]);
Wrapper around code that is supposed to change the screen.
This is the opposite to C<wait_still_screen>. Make sure to put the commands to change the screen
@@ -399,7 +399,7 @@ sub wait_screen_change(&@) {
=head2 assert_screen_change
- assert_screen_change { CODEREF [,$timeout] };
+ assert_screen_change(CODEREF [,$timeout]);
Run C<CODEREF> with C<wait_screen_change> but C<die> if screen did not change
within timeout. Look into C<wait_screen_change> for details
Variant of wait_screen_change but dying on no screen change.
okurz
force-pushed
the
feature/assert_screen_change
branch
from
bae1ebe
to
efc2234
Compare
aaannz
approved these changes
Jan 12, 2017
okurz
added a commit
to okurz/os-autoinst-distri-opensuse
that referenced
this pull request
Jan 13, 2017
os-autoinst/os-autoinst#689 added a new function to the testapi 'assert_screen_change' which should be used wherever there is no explicit checking of the return value of 'wait_screen_change'. Leaving alone the occurences of 'wait_screen_change' where the return code is checked.
okurz
added a commit
to okurz/os-autoinst-distri-opensuse
that referenced
this pull request
Jan 13, 2017
os-autoinst/os-autoinst#689 added a new function to the testapi 'assert_screen_change' which should be used wherever there is no explicit checking of the return value of 'wait_screen_change'. Leaving alone the occurences of 'wait_screen_change' where the return code is checked. Verification run: http://lord.arch/tests/5552
okurz
commented
Jan 13, 2017
| =cut | ||
|
|
||
| sub assert_screen_change(&@) { | ||
| ::wait_screen_change(@_) or die 'assert_screen_change failed to detect a screen change'; |
There was a problem hiding this comment.
I don't know perl, what does :: do here? I just want to call the other method in the same file and without that it didn't work. Also, deleting the parameter part (&@) on both wait_screen_change and assert_screen_change did not work, ideas?
There was a problem hiding this comment.
Perl black magic, ::wait_screen_change is short for main::wait_screen_change
use strict;
use warnings;
sub foo {
print "They called me!";
}
::foo;
foo;
okurz
added a commit
to okurz/os-autoinst-distri-opensuse
that referenced
this pull request
Apr 20, 2017
os-autoinst/os-autoinst#689 added a new function to the testapi 'assert_screen_change' which should be used wherever there is no explicit checking of the return value of 'wait_screen_change'. Leaving alone the occurences of 'wait_screen_change' where the return code is checked.
okurz
added a commit
to okurz/os-autoinst-distri-opensuse
that referenced
this pull request
May 15, 2017
os-autoinst/os-autoinst#689 added a new function to the testapi 'assert_screen_change' which should be used wherever there is no explicit checking of the return value of 'wait_screen_change'. Leaving alone the occurences of 'wait_screen_change' where the return code is checked.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Variant of wait_screen_change but dying on no screen change.