From 0d894c6ec2ff0958170285f7b8e735ad506d64c6 Mon Sep 17 00:00:00 2001
From: Miguel Sousa <msousa@adobe.com>
Date: Wed, 31 May 2017 17:20:34 -0700
Subject: [PATCH] [cffLib.specializer_test] Resolve conflicts

---
 Tests/cffLib/specializer_test.py | 39 --------------------------------
 1 file changed, 39 deletions(-)

diff --git a/Tests/cffLib/specializer_test.py b/Tests/cffLib/specializer_test.py
index 6432a20f4..aa5061192 100644
--- a/Tests/cffLib/specializer_test.py
+++ b/Tests/cffLib/specializer_test.py
@@ -32,107 +32,68 @@ class CFFGeneralizeProgramTest(unittest.TestCase):
 # no arguments/operands
     def test_rmoveto_none(self):
         test_charstr = 'rmoveto'
-        xpct_charstr = ''
         with self.assertRaisesRegex(ValueError, r'\[\]'):
             get_generalized_charstr(test_charstr)
-        self.assertEqual(get_generalized_charstr(
-                                test_charstr, ignoreErrors=True), xpct_charstr)
 
     def test_hmoveto_none(self):
         test_charstr = 'hmoveto'
-        xpct_charstr = ''
         with self.assertRaisesRegex(ValueError, r'\[\]'):
             get_generalized_charstr(test_charstr)
-        self.assertEqual(get_generalized_charstr(
-                                test_charstr, ignoreErrors=True), xpct_charstr)
 
     def test_vmoveto_none(self):
         test_charstr = 'vmoveto'
-        xpct_charstr = ''
         with self.assertRaisesRegex(ValueError, r'\[\]'):
             get_generalized_charstr(test_charstr)
-        self.assertEqual(get_generalized_charstr(
-                                test_charstr, ignoreErrors=True), xpct_charstr)
 
     def test_rlineto_none(self):
         test_charstr = 'rlineto'
-        xpct_charstr = ''
         with self.assertRaisesRegex(ValueError, r'\[\]'):
             get_generalized_charstr(test_charstr)
-        self.assertEqual(get_generalized_charstr(
-                                test_charstr, ignoreErrors=True), xpct_charstr)
 
     def test_hlineto_none(self):
         test_charstr = 'hlineto'
-        xpct_charstr = ''
         with self.assertRaisesRegex(ValueError, r'\[\]'):
             get_generalized_charstr(test_charstr)
-        self.assertEqual(get_generalized_charstr(
-                                test_charstr, ignoreErrors=True), xpct_charstr)
 
     def test_vlineto_none(self):
         test_charstr = 'vlineto'
-        xpct_charstr = ''
         with self.assertRaisesRegex(ValueError, r'\[\]'):
             get_generalized_charstr(test_charstr)
-        self.assertEqual(get_generalized_charstr(
-                                test_charstr, ignoreErrors=True), xpct_charstr)
 
     def test_rrcurveto_none(self):
         test_charstr = 'rrcurveto'
-        xpct_charstr = ''
         with self.assertRaisesRegex(ValueError, r'\[\]'):
             get_generalized_charstr(test_charstr)
-        self.assertEqual(get_generalized_charstr(
-                                test_charstr, ignoreErrors=True), xpct_charstr)
 
     def test_hhcurveto_none(self):
         test_charstr = 'hhcurveto'
-        xpct_charstr = ''
         with self.assertRaisesRegex(ValueError, r'\[\]'):
             get_generalized_charstr(test_charstr)
-        self.assertEqual(get_generalized_charstr(
-                                test_charstr, ignoreErrors=True), xpct_charstr)
 
     def test_vvcurveto_none(self):
         test_charstr = 'vvcurveto'
-        xpct_charstr = ''
         with self.assertRaisesRegex(ValueError, r'\[\]'):
             get_generalized_charstr(test_charstr)
-        self.assertEqual(get_generalized_charstr(
-                                test_charstr, ignoreErrors=True), xpct_charstr)
 
     def test_hvcurveto_none(self):
         test_charstr = 'hvcurveto'
-        xpct_charstr = ''
         with self.assertRaisesRegex(ValueError, r'\[\]'):
             get_generalized_charstr(test_charstr)
-        self.assertEqual(get_generalized_charstr(
-                                test_charstr, ignoreErrors=True), xpct_charstr)
 
     def test_vhcurveto_none(self):
         test_charstr = 'vhcurveto'
-        xpct_charstr = ''
         with self.assertRaisesRegex(ValueError, r'\[\]'):
             get_generalized_charstr(test_charstr)
-        self.assertEqual(get_generalized_charstr(
-                                test_charstr, ignoreErrors=True), xpct_charstr)
 
     def test_rcurveline_none(self):
         test_charstr = 'rcurveline'
-        xpct_charstr = ''
         with self.assertRaisesRegex(ValueError, r'\[\]'):
             get_generalized_charstr(test_charstr)
-        self.assertEqual(get_generalized_charstr(
-                                test_charstr, ignoreErrors=True), xpct_charstr)
 
     def test_rlinecurve_none(self):
         test_charstr = 'rlinecurve'
-        xpct_charstr = ''
         with self.assertRaisesRegex(ValueError, r'\[\]'):
             get_generalized_charstr(test_charstr)
-        self.assertEqual(get_generalized_charstr(
-                                test_charstr, ignoreErrors=True), xpct_charstr)
 
 # rmoveto
     def test_rmoveto_zero(self):