Merge lp:~joetalbott/utah/doc_client_updates into lp:utah

Proposed by Joe Talbott
Status: Merged
Merged at revision: 688
Proposed branch: lp:~joetalbott/utah/doc_client_updates
Merge into: lp:utah
Diff against target: 67 lines (+20/-1)
2 files modified
debian/changelog (+6/-0)
docs/source/development.rst (+14/-1)
To merge this branch: bzr merge lp:~joetalbott/utah/doc_client_updates
Reviewer Review Type Date Requested Status
Max Brustkern (community) Approve
Joe Talbott (community) Needs Resubmitting
Review via email: mp+126742@code.launchpad.net

Description of the change

Add some wording to clarify which fields in the control and runlist files are required.

To post a comment you must log in.
Revision history for this message
Max Brustkern (nuclearbob) wrote :

On line 31 of the merge:
'Name' must correspond tot the
I'm guessing you mean "to the".

On line 42:
has cachedd credentials
Maybe "cached"?

Finally, when tc_setup sets up the "environment" this doesn't appear to include any propagating environment variables defined in tc_setup into the environment used to run the actual command. I'm guessing this is intentional, but it might be useful to note that in here somewhere? I'm not sure of the best way to put it.

Other than that, good stuff.

689. By Joe Talbott

client - Fix some typos and reword 'tc_setup' description.

Revision history for this message
Joe Talbott (joetalbott) wrote :

Updated to address the issues you pointed out.

review: Needs Resubmitting
Revision history for this message
Max Brustkern (nuclearbob) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-09-27 13:57:33 +0000
3+++ debian/changelog 2012-09-28 20:19:20 +0000
4@@ -1,3 +1,9 @@
5+utah (0.4ubuntu67) precise; urgency=low
6+
7+ * Update client docs to explain files a bit more clearly
8+
9+ -- Joe Talbott <joe.talbott@canonical.com> Thu, 27 Sep 2012 12:50:08 -0400
10+
11 utah (0.4ubuntu66) precise; urgency=low
12
13 * Add 'run_as' support
14
15=== modified file 'docs/source/development.rst'
16--- docs/source/development.rst 2012-09-27 14:37:27 +0000
17+++ docs/source/development.rst 2012-09-28 20:19:20 +0000
18@@ -64,7 +64,7 @@
19
20 - name: testsuite1
21 fetch_cmd : git clone/pull wherever
22- include_tests:
23+ include_tests:
24 - t1
25 - t2
26 - t3...
27@@ -74,6 +74,10 @@
28 - st4
29 - st5
30
31+The only required fields are 'name' and 'fetch_cmd'. 'Name' must correspond to the name of the top-level testsuite directory. 'Fetch_cmd' should be a command that populates the testsuite directory created by utah-client with actual testsuite directory structure.
32+
33+'Include_tests' will limit the testcases that are run to only those listed by this option. 'Exclude_tests' will run all the tests in the testsuite's tslist.run file except those listed by this option.
34+
35 Test suites can be divided in categories (for our internal use, or for test
36 cases submitted to our test case base) or they can be in a repository anywhere.
37
38@@ -91,6 +95,8 @@
39 overrides: # array of control properties to override
40 - timeout: 200 # timeout in seconds
41
42+'Test' is the only required field in this file and must match a directory name in the testsuite tree. 'Run_as' utilizes sudo to run the testcase as the given user. NOTE: this requires that the user running the utah client either has cached credentials or is allowed to run commands without a password. The 'overrides' array accepts any option from the tc_control file. Overrides should be used sparingly since it makes more sense to adjust the options in the tc_control file rather than here.
43+
44 **ts_control file contains:**
45
46 ::
47@@ -101,6 +107,7 @@
48 # the whole test suite
49 ts_cleanup: tcleanup/cleanup.sh # clean up test suite
50
51+There are no required fields in this file.
52
53 To avoid excessive typing and repetition in runlists and control files the
54 following rules apply:
55@@ -147,6 +154,12 @@
56 tc_setup: t1/t1 setup # in case the test case has a setup
57 tc_cleanup: t1/t1 cleanup # in case the test has a cleanup
58
59+In this file 'command', 'description', 'dependencies', 'actions', 'expected_results', and 'timeout' are required. 'Command' is the command to actually run the test. 'Description' is a textual description of the test. 'Dependencies' is a list of items the test depends on. 'Action' is a list of actions the test executes and 'expected_results' is a list of what those actions should result in. 'Timeout' is the ammount of time the test should complete within and is used to avoid tests that might loop indefinitely.
60+
61+'Type' currently defaults to 'userland' and may in the future have other options as the need arises.
62+
63+'Build_cmd' can be used to build any binary test cases. 'Tc_setup' can be used to setup any needed data or files for the test and 'tc_cleanup' can be used to remove the data or files added by 'tc_setup'. 'Build_cmd', 'tc_setup', and 'tc_cleanup' are all simple shell commands similar to 'command'.
64+
65 For each test case that is a binary or a script, there will be an option
66 to define a setup and a cleanup function if they wish so, and it is the test
67 code developer’s responsibility to add the right parameters to their code so

Subscribers

People subscribed via source and target branches