draft

selfdrive/test/fuzzy_generation.py

@@ -1,11 +1,14 @@
+import capnp
 import hypothesis.strategies as st
+from typing import Optional, List
 
 from cereal import log
 
+
 class FuzzyGenerator:
   def __init__(self, draw, real_floats):
     self.draw = draw
-    self.real_floats=real_floats
+    self.real_floats = real_floats
 
   def generate_native_type(self, field):
     def floats(**kwargs):
@@ -62,15 +65,26 @@ class FuzzyGenerator:
     else:
       return self.generate_struct(field.schema)
 
-  def generate_struct(self, schema, event=None):
+  def generate_struct(self, schema: capnp.lib.capnp._StructSchema, event: Optional[str] = None):
     full_fill = list(schema.non_union_fields)
-    single_fill = [event] if event else [self.draw(st.sampled_from(schema.union_fields))] if schema.union_fields else []
-    return st.fixed_dictionaries(dict((field, self.generate_field(schema.fields[field])) for field in full_fill + single_fill))
+    # print('full_fill', full_fill)
+    # if len(schema.union_fields):
+    #   print('union', event, schema.union_fields)
+    # single_fill = [event] if event else [self.draw(st.sampled_from(schema.union_fields))] if schema.union_fields else []
+    single_fill = [event] if event else [st.sampled_from(schema.union_fields).example()] if schema.union_fields else []
+    single_fill_new = [event] if event else [st.sampled_from(schema.union_fields)] if schema.union_fields else []
+    if not event and len(schema.union_fields):
+      print('old v. new')
+      print('old', single_fill)
+      print(schema.fields[single_fill[0]])
+      print('new', single_fill_new)
+    return st.fixed_dictionaries(dict((field, self.generate_field(schema.fields[field])) for field in full_fill + single_fill_new))
 
   @classmethod
   def get_random_msg(cls, draw, struct, real_floats=False):
     fg = cls(draw, real_floats=real_floats)
-    return draw(fg.generate_struct(struct.schema))
+    # return draw(fg.generate_struct(struct.schema))
+    return fg.generate_struct(struct.schema).example()
 
   @classmethod
   def get_random_event_msg(cls, draw, events, real_floats=False):

selfdrive/test/process_replay/test_fuzzy.py

@@ -22,6 +22,8 @@ class TestFuzzProcesses(unittest.TestCase):
   @settings(phases=[Phase.generate, Phase.target], max_examples=50, deadline=1000, suppress_health_check=[HealthCheck.too_slow, HealthCheck.data_too_large])
   def test_fuzz_process(self, proc_name, cfg, data):
     msgs = FuzzyGenerator.get_random_event_msg(data.draw, events=cfg.pubs, real_floats=True)
+    # print('msgs', msgs)
+    # exit()
     lr = [log.Event.new_message(**m).as_reader() for m in msgs]
     cfg.timeout = 5
     pr.replay_process(cfg, lr, TOYOTA.COROLLA_TSS2, TOYOTA.COROLLA_TSS2, disable_progress=True)