[Tests][KiCad 8] Adapted some cases and references

INTI-CMNB · Feb 8, 2024 · 652e7dc · 652e7dc
1 parent 57afc1d
commit 652e7dc
Show file tree

Hide file tree

Showing 12 changed files with 400 additions and 70 deletions.
diff --git a/tests/board_samples/kicad_8/test_v5.kicad_pcb b/tests/board_samples/kicad_8/test_v5.kicad_pcb
diff --git a/tests/board_samples/kicad_8/test_v5.kicad_pcb b/tests/board_samples/kicad_8/test_v5.kicad_pcb
diff --git a/tests/data/config_redirect/8.0 b/tests/data/config_redirect/8.0
@@ -0,0 +1 @@
+6.0
diff --git a/tests/data/kicad/8.0 b/tests/data/kicad/8.0
@@ -0,0 +1 @@
+6.0
diff --git a/tests/data/kicad_err_1/8.0 b/tests/data/kicad_err_1/8.0
@@ -0,0 +1 @@
+6.0
diff --git a/tests/data/kicad_err_2/8.0 b/tests/data/kicad_err_2/8.0
@@ -0,0 +1 @@
+6.0
diff --git a/tests/data/kicad_ok/6.0/8.0 b/tests/data/kicad_ok/6.0/8.0
@@ -0,0 +1 @@
+8.0
diff --git a/tests/data/kicad_ok/8.0 b/tests/data/kicad_ok/8.0
@@ -0,0 +1 @@
+6.0
diff --git a/tests/reference/8_0_0/gencad-gencad.cad b/tests/reference/8_0_0/gencad-gencad.cad
@@ -9,10 +9,10 @@ INTERTRACK 0
 $ENDHEADER
 
 $BOARD
-LINE 7.4 -2.75 5.6 -2.75
-LINE 5.6 -2.75 5.6 -3.6
-LINE 7.4 -3.6 7.4 -2.75
-LINE 5.6 -3.6 7.4 -3.6
+LINE 7.4 -3.6 5.6 -3.6
+LINE 5.6 -3.6 5.6 -2.75
+LINE 5.6 -2.75 7.4 -2.75
+LINE 7.4 -2.75 7.4 -3.6
 $ENDBOARD
 
 $PADS

diff --git a/tests/reference/8_0_0/glasgow-boardview.brd b/tests/reference/8_0_0/glasgow-boardview.brd
@@ -1,74 +1,78 @@
 0
-BRDOUT: 69 5118 4724
-4976 2796
-4991 2798
-5006 2802
-5020 2807
-5034 2813
-5048 2821
-5060 2831
-5071 2841
-5082 2852
-5091 2865
-5099 2878
-5106 2892
-5111 2907
-5115 2922
-5117 2937
+BRDOUT: 73 5118 4724
+4968 2795
+4983 2796
+4998 2799
+5013 2804
+5028 2810
+5041 2817
+5054 2826
+5066 2836
+5077 2846
+5087 2858
+5095 2871
+5103 2885
+5108 2899
+5113 2914
+5116 2929
+5118 2945
 5118 2952
 5118 4566
-5117 4582
-5115 4597
-5111 4612
-5106 4627
-5099 4641
-5091 4654
-5082 4666
-5071 4678
-5060 4688
-5048 4697
-5034 4705
-5020 4712
-5006 4717
-4991 4721
-4976 4723
+5118 4574
+5116 4590
+5113 4605
+5108 4620
+5103 4634
+5095 4647
+5087 4660
+5077 4672
+5066 4683
+5054 4693
+5041 4702
+5028 4709
+5013 4715
+4998 4719
+4983 4722
+4968 4724
 4960 4724
 2125 4724
-2110 4723
-2095 4721
-2080 4717
-2065 4712
-2051 4705
-2038 4697
-2026 4688
-2014 4678
-2004 4666
-1995 4654
-1987 4641
-1980 4627
-1975 4612
-1971 4597
-1969 4582
+2118 4724
+2102 4722
+2087 4719
+2072 4715
+2058 4709
+2044 4702
+2032 4693
+2020 4683
+2009 4672
+1999 4660
+1990 4647
+1983 4634
+1977 4620
+1973 4605
+1970 4590
+1968 4574
 1968 4566
 1968 2952
-1969 2937
-1971 2922
-1975 2907
-1980 2892
-1987 2878
-1995 2865
-2004 2852
-2014 2841
-2026 2831
-2038 2821
-2051 2813
-2065 2807
-2080 2802
-2095 2798
-2110 2796
+1968 2945
+1970 2929
+1973 2914
+1977 2899
+1983 2885
+1990 2871
+1999 2858
+2009 2846
+2020 2836
+2032 2826
+2044 2817
+2058 2810
+2072 2804
+2087 2799
+2102 2796
+2118 2795
 2125 2795
 4960 2795
-4976 2796
+4968 2795
 
 NETS: 227
 1 /SDA

diff --git a/tests/reference/8_0_0/populating_4.png b/tests/reference/8_0_0/populating_4.png
@@ -0,0 +1 @@
+../7_0_10/populating_4.png
diff --git a/tests/test_plot/test_kicad_config_errors.py b/tests/test_plot/test_kicad_config_errors.py
@@ -86,7 +86,9 @@ def test_kicad_conf_guess_libs(monkeypatch):
     """ Check no HOME and fail to load kicad_common.
         Also check we correctly guess the libs dir. """
     res = check_load_conf(fail=True, no_conf_path=True)
-    if context.ki7():
+    if context.ki8():
+        name = "KICAD8_SYMBOL_DIR"
+    elif context.ki7():
         name = "KICAD7_SYMBOL_DIR"
     elif context.ki6():
         name = "KICAD6_SYMBOL_DIR"
@@ -98,7 +100,9 @@ def test_kicad_conf_guess_libs(monkeypatch):
 
 def test_kicad_conf_lib_env(monkeypatch):
     """ Check we can use KICAD_SYMBOL_DIR as fallback """
-    if context.ki7():
+    if context.ki8():
+        name = "KICAD8_SYMBOL_DIR"
+    elif context.ki7():
         name = "KICAD7_SYMBOL_DIR"
     elif context.ki6():
         name = "KICAD6_SYMBOL_DIR"

diff --git a/tests/test_plot/test_misc.py b/tests/test_plot/test_misc.py
@@ -1934,7 +1934,7 @@ def test_populate_1(test_dir):
     prj = 'simple_2layer'  # Fake
     ctx = context.TestContext(test_dir, prj, 'populate', 'Populate')
     ctx.run(no_board_file=True, extra=['-b', 'tests/data/ArduinoLearningKitStarter.kicad_pcb', 'Populate'])
-    ctx.compare_image('Populate/img/populating_4.png', 'populating_4.png')
+    ctx.compare_image('Populate/img/populating_4.png', 'populating_4.png', tol=100)
     ctx.clean_up()