frsh: Remove artificial split of a test

When a single test is split into several parts then the output
of the beginning of the test is not shown when the error occurs in the
later part.

diff --git a/frsh_api/tests/negotiation.c b/frsh_api/tests/negotiation.c
index 575044f36a15aa883341ce19eaecadf104ef1ff2..69a000bd78f3ebb5de5832b703e4ac081144a05a 100644 (file)
--- a/frsh_api/tests/negotiation.c
+++ b/frsh_api/tests/negotiation.c
@@ -73,10 +73,8 @@ WVTEST_MAIN("basic negotiation")
                WVPASS(fres_contract_get_budget(&c, &budget));
                WVPASS(fosa_rel_time_to_msec(budget) == b[i]);
        }
-}
 
-WVTEST_MAIN("renegotiation")
-{
+       /* Renegotiate the contracts */
        for (i=0; i<2; i++) {
                budget = fosa_msec_to_rel_time(2*b[i]);
                period = fosa_msec_to_rel_time(110);
@@ -104,10 +102,7 @@ WVTEST_MAIN("renegotiation")
        WVFRSH(frsh_vres_get_contract(vres[i], &c));
        WVPASS(fres_contract_get_budget(&c, &budget));
        WVPASS(fosa_rel_time_to_msec(budget) == b[i]);
-}
 
-WVTEST_MAIN("cancelation")
-{
        /* Cancel N contracts */
        for (i=0; i<N; i++) {
                ret = WVFRSH(frsh_contract_cancel(vres[i]));