From 28a7cc0139f467afd1a202ea8c81e6fabf909b4c Mon Sep 17 00:00:00 2001
From: ChrisAdderley <cadderley@gmail.com>
Date: Mon, 4 Mar 2019 10:06:55 -0800
Subject: [PATCH] Add packaging test support

---
 .travis.yml                                          |  1 +
 .../Patches/Electrical/restock-solarpanels.cfg       | 12 ++++++------
 Distribution/Restock/changelog.txt                   |  7 +++++++
 Distribution/RestockPlus/changelog.txt               |  1 +
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 993819c7..983a4de7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ script:
   - cd build-deploy
   - git checkout master
   - cd ..
+  - pytest -s --testpath "Distribution/" build-deploy/src/tests/  # run the deploy tests
   - python build-deploy/src/package.py  --f "Distribution/Restock/.mod_data.yml"  # Build RS package
   - python build-deploy/src/package.py --f "Distribution/RestockPlus/.mod_data.yml"  # Build RS+ package
 before_deploy:
diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg
index 3fed2e61..20268462 100644
--- a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg
@@ -1,8 +1,8 @@
 // Patches applying art changes to solar panels
 // Contents:
-// -  (solarPanels4)
-// -  (solarPanels2)
-// -  (solarPanels3)
+// - OX-4L 1x6 Photovoltaic Panels (solarPanels4)
+// - SP-L 1x6 Photovoltaic Panels (solarPanels3)
+// - OX-4W 3x2 Photovoltaic Panels (solarPanels2)
 // - SP-W 3x2 Photovoltaic Panels (solarPanels1)
 // - Gigantor XL Solar Array (largeSolarPanel)
 // -  ()
@@ -50,7 +50,7 @@
       FLOAT_PROPERTY
       {
         name = _Shininess
-        value = 0.8 
+        value = 0.8
       }
     }
   }
@@ -77,7 +77,7 @@
   MODULE
   {
     name = ModuleRestockModifyMaterials
-    
+
     MATERIAL
     {
       shader = KSP/Bumped Specular (Mapped)
@@ -215,4 +215,4 @@
     scale = 1,1,1
     rotation = 0, 0, 0
   }
-}
\ No newline at end of file
+}
diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt
index 56685fb3..94674b40 100644
--- a/Distribution/Restock/changelog.txt
+++ b/Distribution/Restock/changelog.txt
@@ -130,6 +130,13 @@
   - Z-400 Rechargeable Battery (Nertea)
   - Z-100 Rechargeable Battery Pack (Nertea)
   - PB-NUK Radioisotope Thermoelectric Generator (Beale)
+  - OX-4L 1x6 Photovoltaic Panels (Beale)
+  - SP-L 1x6 Photovoltaic Panels (Beale)
+  - OX-4W 3x2 Photovoltaic Panels (Beale)
+  - SP-W 3x2 Photovoltaic Panels (Beale)
+  - Gigantor XL Solar Array (Nertea)
+  - OX-STAT Photovoltaic Panels (Nertea)
+  - OX-STAT-XL Photovoltaic Panels (Nertea)
  - Science
   - Science Mobile Processing Lab MPL-LG-2 (Nertea)
   - Thermometer (Andrew Cassidy)
diff --git a/Distribution/RestockPlus/changelog.txt b/Distribution/RestockPlus/changelog.txt
index 54b088bd..7ea97226 100644
--- a/Distribution/RestockPlus/changelog.txt
+++ b/Distribution/RestockPlus/changelog.txt
@@ -24,6 +24,7 @@ v0.1.0
 - New Coupling parts
  - TD-18 Stack Decoupler (Nertea): 1.875m decoupler. Replaces MH decoupler if installed
  - TS-18 Stack Separator (Nertea): 1.875m separator. Replaces MH separator if installed
+ - TT-14 Decoupler (Nertes): Tiny radial decoupler suitable for 0.625m boosters
  - Clamp-O-Tron Docking Port 'Grande' (Nertea): 3.75m docking port
 - New Structural parts
  - Kerbodyne ADTP-2-3A (Nertea): A hollow version of the fuelled 3.75 to 2.5m adapter