Fix creation of test plans from GiddyUp

Author: Brett Hazen

src/giddyup.erl

@@ -266,12 +266,12 @@ fetch_all_test_plans(Platform, Product, VersionNumber, DefaultVersion, Host) ->
             Id = kvc:path(id, Test),
             Module = binary_to_atom(kvc:path(name, Test), utf8),
             Plan0 = rt_test_plan:new([{id, Id}, {module, Module}, {project, Project}, {platform, Platform}, {version, VersionNumber}]),
-            Plan1 = case kvc:path('tags.backend', Test) of
-                          [] -> Plan0;
-                          X -> rt_test_plan:set(backend, binary_to_atom(X, utf8), Plan0)
+            {ok, Plan1} = case kvc:path('tags.backend', Test) of
+                          [] -> {ok, Plan0};
+                          Backend -> rt_test_plan:set(backend, binary_to_atom(Backend, utf8), Plan0)
                       end,
-            Plan2 = case kvc:path('tags.upgrade_version', Test) of
-                [] -> Plan1;
+            {ok, Plan2} = case kvc:path('tags.upgrade_version', Test) of
+                [] -> {ok, Plan1};
                 UpgradeVsn ->
                     UpgradeVersion = case UpgradeVsn of
                                          <<"legacy">> -> rt_config:get_legacy_version();
@@ -285,6 +285,7 @@ fetch_all_test_plans(Platform, Product, VersionNumber, DefaultVersion, Host) ->
             %%    [] -> Plan1;
             %%    MultiConfig -> rt_test_plan:set(multi_config, binary_to_atom(MultiConfig, utf8), Plan2)
             %%end,
+            lager:debug("Giddyup Module ~p using TestPlan ~p", [Module, Plan2]),
             Plan2
         end,
     [ TestProps(Test) || Test <- Tests].

src/rt_planner.erl

@@ -187,23 +187,26 @@ init([]) ->
 %% If none are specified, run everything
 handle_call({load_from_giddyup, Backends, CommandLineTests}, _From, State) ->
     AllGiddyupTests = giddyup:get_test_plans(),
-    FilteredNames = case CommandLineTests of
+    {Included, Excluded} = case CommandLineTests of
         [] ->
-            AllGiddyupTests;
+            {AllGiddyupTests, []};
         _ ->
-            [TestPlan || TestPlan <- AllGiddyupTests,
-                                     CName <- CommandLineTests,
-                                     rt_test_plan:get_module(TestPlan) =:= CName]
+            Inc = [TestPlan || TestPlan <- AllGiddyupTests,
+                               CName <- CommandLineTests,
+                               rt_test_plan:get_module(TestPlan) =:= CName],
+            {Inc, lists:filter(fun(Elem) -> not lists:member(Elem, Inc) end, AllGiddyupTests)}
         end,
-    FilteredTests = case Backends of
+    {Included1, Excluded1} = case Backends of
         undefined ->
-            FilteredNames;
+            {Included, Excluded};
         _ ->
-            [TestPlan || TestPlan <- FilteredNames,
-                                     lists:member(rt_test_plan:get(backend, TestPlan), Backends)]
+            Inc1 = [TestPlan || TestPlan <- Included,
+                                            lists:member(rt_test_plan:get(backend, TestPlan), Backends)],
+            {Inc1, lists:filter(fun(Elem) -> not lists:member(Elem, Inc1) end, AllGiddyupTests)}
         end,
-    State1 = lists:foldl(fun sort_and_queue/2, State, FilteredTests),
-    {reply, ok, State1};
+    State1 = lists:foldl(fun sort_and_queue/2, State, Included1),
+    State2 = lists:foldl(fun exclude_test_plan/2, State1, Excluded1),
+    {reply, ok, State2};
 %% Add a single test plan to the queue
 handle_call({add_test_plan, Module, Platform, Backends, _Version, _Properties}, _From, State) ->
     State1 = lists:foldl(fun(Backend, AccState) ->
@@ -330,3 +333,13 @@ is_runnable_test_plan(TestPlan) ->
     code:ensure_loaded(Mod),
     erlang:function_exported(Mod, Fun, 0) orelse
         erlang:function_exported(Mod, Fun, 1).
+
+%%--------------------------------------------------------------------
+%% @private
+%% @doc
+%% Add a unused test to the list of non_runnable_test_plans
+%% @end
+%%--------------------------------------------------------------------
+exclude_test_plan(TestPlan, State) ->
+    QNR = queue:in(TestPlan, State#state.non_runnable_test_plans),
+    State#state{non_runnable_test_plans=QNR}.

src/rt_test_plan.erl

@@ -161,13 +161,13 @@ set_fields(_, _, {error, _}=Error) ->
 validate_request(Field, TestPlan) ->
     validate_field(Field, validate_record(TestPlan)).
 
--spec validate_record(test_plan()) -> ok | {error, invalid_properties}.
+-spec validate_record(test_plan()) -> ok | {error, invalid_test_plan}.
 validate_record(Record) ->
     case is_valid_record(Record) of
         true ->
             ok;
         false ->
-            {error, invalid_properties}
+            {error, invalid_test_plan}
     end.
 
 -spec validate_field(atom(), ok | {error, atom()}) -> ok | {error, invalid_field}.