PM #9 - Fix remote server usage. The current implementation was using…

… the old data model.
CFMTech · Mar 31, 2020 · 3bb0fdf · 3bb0fdf
1 parent 755115f
commit 3bb0fdf
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/docs/sources/changelog.rst b/docs/sources/changelog.rst
@@ -2,6 +2,9 @@
 Changelog
 =========
 
+* :release:`1.1.1 <2020-03-31>`
+* :bug:`9` Fix remote server interface for sending measures.
+
 * :release:`1.1.0 <2020-03-30>`
 * :feature:`5` Extend item information and separate item from its variants.
 * :feature:`3` Compute user time and kernel time on a per test basis for clarity and ease of exploitation.

diff --git a/pytest_monitor/session.py b/pytest_monitor/session.py
@@ -64,7 +64,16 @@ def compute_info(self, description):
         if self.__db:
             self.__db.insert_session(self.__session, run_date, scm, description)
         if self.__remote:
-            warnings.warn('todo')
+            r = requests.post(f'{self.__remote}/sessions/',
+                              json=dict(session_h=self.__session,
+                                        run_date=run_date,
+                                        scm_ref=scm,
+                                        description=description))
+            if r.status_code != 200:
+                self.__remote = ''
+                msg = f"Cannot insert session in remote monitor server ({r.status_code})! Deactivating...')"
+                warnings.warn(msg)
+
 
     def set_environment_info(self, env):
         self.__eid = self.get_env_id(env)
@@ -105,13 +114,21 @@ def add_test_info(self, item, item_path, item_variant, item_loc, kind, component
                                     kernel_time, cpu_usage, mem_usage)
         if self.__remote and self.remote_env_id is not None:
             r = requests.post(f'{self.__remote}/metrics/',
-                              json=dict(context_h=self.remote_env_id,
-                                        item=item, kind=kind, component=final_component, total_time=total_time,
-                                        item_start_time=item_start_time, user_time=user_time,
+                              json=dict(session_h=self.__session,
+                                        context_h=self.remote_env_id,
+                                        item_start_time=item_start_time,
+                                        item_path=item_path,
+                                        item=item,
+                                        item_variant=item_variant,
+                                        item_fs_loc=item_loc,
+                                        kind=kind,
+                                        component=final_component,
+                                        total_time=total_time,
+                                        user_time=user_time,
                                         kernel_time=kernel_time,
-                                        cpu_usage=cpu_usage, mem_usage=mem_usage))
+                                        cpu_usage=cpu_usage,
+                                        mem_usage=mem_usage))
             if r.status_code != 200:
-                print(r.text)
                 self.__remote = ''
                 msg = f"Cannot insert values in remote monitor server ({r.status_code})! Deactivating...')"
                 warnings.warn(msg)