| Message ID | 20180103123456.9238-1-christian.storm@siemens.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2,1/3] suricatta: fix broken tests due to channel refactoring | expand |
On 03/01/2018 13:34, Christian Storm wrote: > Suricatta's tests were broken due to commit 0c17ff0 moving > suricatta/channel_hawkbit.c => corelib/channel_curl.c and > suricatta/channel_hawkbit.h => include/channel_curl.h. > Adapt the tests to reflect those changes, making the tests > working again. > > Signed-off-by: Christian Storm <christian.storm@siemens.com> > --- > suricatta/test/test_server_hawkbit.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/suricatta/test/test_server_hawkbit.c b/suricatta/test/test_server_hawkbit.c > index 9560509..86e2dc5 100644 > --- a/suricatta/test/test_server_hawkbit.c > +++ b/suricatta/test/test_server_hawkbit.c > @@ -28,7 +28,8 @@ > #include <swupdate_status.h> > #include "suricatta/suricatta.h" > #include "server_hawkbit.h" > -#include "channel_hawkbit.h" > +#include "channel.h" > +#include "channel_curl.h" > #include "suricatta/state.h" > > #define JSON_OBJECT_FREED 1 > Applied to -master, thanks ! Best regards, Stefano Babic
On 03/01/2018 13:34, Christian Storm wrote: > channel_t is used in server_hawkbit_t struct, > so include channel.h in server_hawkbit.h. > > Signed-off-by: Christian Storm <christian.storm@siemens.com> > --- > suricatta/server_hawkbit.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/suricatta/server_hawkbit.h b/suricatta/server_hawkbit.h > index fba399c..0655980 100644 > --- a/suricatta/server_hawkbit.h > +++ b/suricatta/server_hawkbit.h > @@ -21,6 +21,7 @@ > #include <stdbool.h> > #include <suricatta/state.h> > #include <swupdate_dict.h> > +#include <channel.h> > > /* Have a queue for errors reported by installer */ > #define HAWKBIT_MAX_REPORTED_ERRORS 10 > Applied to -master, thanks ! Best regards, Stefano Babic
diff --git a/suricatta/test/test_server_hawkbit.c b/suricatta/test/test_server_hawkbit.c index 9560509..86e2dc5 100644 --- a/suricatta/test/test_server_hawkbit.c +++ b/suricatta/test/test_server_hawkbit.c @@ -28,7 +28,8 @@ #include <swupdate_status.h> #include "suricatta/suricatta.h" #include "server_hawkbit.h" -#include "channel_hawkbit.h" +#include "channel.h" +#include "channel_curl.h" #include "suricatta/state.h" #define JSON_OBJECT_FREED 1
Suricatta's tests were broken due to commit 0c17ff0 moving suricatta/channel_hawkbit.c => corelib/channel_curl.c and suricatta/channel_hawkbit.h => include/channel_curl.h. Adapt the tests to reflect those changes, making the tests working again. Signed-off-by: Christian Storm <christian.storm@siemens.com> --- suricatta/test/test_server_hawkbit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)